diff --git a/devenv.nix b/devenv.nix index eb384c9ff37f23d1b7bba138e911c6ed60de677e..e0abf3d1353d70dd6c10c389d803b74eb0ac29b5 100644 --- a/devenv.nix +++ b/devenv.nix @@ -226,21 +226,20 @@ builds: scripts.tag-version.exec = '' !#${pkgs.bash}/bin/bash - - ${pkgs.git}/bin/git config user.email "''${GITLAB_USER_EMAIL}" ;\ - ${pkgs.git}/bin/git config user.name "''${GITLAB_USER_NAME:-"Gitlab CI"}" ;\ - ${pkgs.git}/bin/git config credential.helper '!f() { echo "username=gitlab-ci-token"; echo "password=''${CI_JOB_TOKEN}"; }; f' ;\ - ${pkgs.git}/bin/git config pull.rebase true ;\ - ${pkgs.git}/bin/git config http.sslVerify "false" ;\ - ${pkgs.git}/bin/git remote set-url origin https://pad:''${GITLAB_TOKEN}@''${CI_REPOSITORY_URL#*@} ;\ - ${pkgs.git}/bin/git fetch --all --tags --unshallow ;\ - ${pkgs.git}/bin/git reset --hard origin/master ;\ - ${pkgs.git}/bin/git checkout $CI_COMMIT_REF_NAME ;\ - ${pkgs.git}/bin/git pull origin $CI_COMMIT_REF_NAME ;\ - ${inputs.version.defaultPackage."${builtins.currentSystem}"}/bin/version auto --git --verbose ;\ + set -x + ${pkgs.git}/bin/git config user.email "''${GITLAB_USER_EMAIL}" + ${pkgs.git}/bin/git config user.name "''${GITLAB_USER_NAME:-"Gitlab CI"}" + ${pkgs.git}/bin/git config credential.helper '!f() { echo "username=gitlab-ci-token"; echo "password=''${CI_JOB_TOKEN}"; }; f' + ${pkgs.git}/bin/git config pull.rebase true + ${pkgs.git}/bin/git config http.sslVerify "false" + ${pkgs.git}/bin/git remote set-url origin https://pad:''${GITLAB_TOKEN}@''${CI_REPOSITORY_URL#*@} + ${pkgs.git}/bin/git fetch --all --tags --unshallow + ${pkgs.git}/bin/git reset --hard origin/master + ${pkgs.git}/bin/git checkout $CI_COMMIT_REF_NAME + ${pkgs.git}/bin/git pull origin $CI_COMMIT_REF_NAME + ${inputs.version.defaultPackage."${builtins.currentSystem}"}/bin/version auto --git --verbose ${pkgs.git}/bin/git push origin $CI_COMMIT_REF_NAME - ''; scripts.update-files.exec = '' !#${pkgs.bash}/bin/bash @@ -269,7 +268,6 @@ builds: cat ${gitlabCiYaml} > "${config.devenv.root}/.gitlab-ci.yml" - ''; @@ -281,50 +279,57 @@ builds: difftastic.enable = true; - - # This script is executed when the app is built - # You can use it to build the app + scripts.build-app.exec = '' #!${pkgs.bash}/bin/bash -set -x - -PATH="''${PATH}":${pkgs.coreutils}/bin -PATH="''${PATH}":${pkgs.findutils}/bin -PATH="''${PATH}":${pkgs.jq}/bin/ -PATH="''${PATH}":${pkgs.rsync}/bin/ -PATH="''${PATH}":${pkgs.bash}/bin/ -PATH="''${PATH}":${pkgs.curl}/bin/ -PATH="''${PATH}":${pkgs.moreutils}/bin/ -PATH="''${PATH}":${pkgs.gnutar}/bin -PATH="''${PATH}":${pkgs.gzip}/bin/ -PATH="''${PATH}":${pkgs.procps}/bin/ -PATH="''${PATH}":${pkgs.eza}/bin/ -PATH="''${PATH}":${pkgs.git}/bin/ -PATH="''${PATH}":${pkgs.gnugrep}/bin/ -PATH="''${PATH}":${inputs.version.defaultPackage."${builtins.currentSystem}"}/bin/ - -export PATH - - -if [ -z "'CI_JOB_TOKEN" ]; then - version=''$(git describe --tags --always --dirty) - buildDate=''$(date -u +"%Y-%m-%dT%H:%M:%SZ") -else - version=''$(version predict --git) - buildDate=''$(version date) -fi - -${config.devenv.root}/bin/go-compile.sh \ - "${config.devenv.root}/source/" \ - "${config.devenv.root}/dist"/ \ - "version" \ - "main" \ - "''${version}" \ - "''${buildDate}" - - -''; +${pkgs.nix}/bin/nix build .#version + + ''; + +# # This script is executed when the app is built +# # You can use it to build the app +# scripts.build-app.exec = '' +##!${pkgs.bash}/bin/bash +# +#set -x +# +#PATH="''${PATH}":${pkgs.coreutils}/bin +#PATH="''${PATH}":${pkgs.findutils}/bin +#PATH="''${PATH}":${pkgs.jq}/bin/ +#PATH="''${PATH}":${pkgs.rsync}/bin/ +#PATH="''${PATH}":${pkgs.bash}/bin/ +#PATH="''${PATH}":${pkgs.curl}/bin/ +#PATH="''${PATH}":${pkgs.moreutils}/bin/ +#PATH="''${PATH}":${pkgs.gnutar}/bin +#PATH="''${PATH}":${pkgs.gzip}/bin/ +#PATH="''${PATH}":${pkgs.procps}/bin/ +#PATH="''${PATH}":${pkgs.eza}/bin/ +#PATH="''${PATH}":${pkgs.git}/bin/ +#PATH="''${PATH}":${pkgs.gnugrep}/bin/ +#PATH="''${PATH}":${inputs.version.defaultPackage."${builtins.currentSystem}"}/bin/ +# +#export PATH +# +# +#if [ -z "'CI_JOB_TOKEN" ]; then +# version=''$(git describe --tags --always --dirty) +# buildDate=''$(date -u +"%Y-%m-%dT%H:%M:%SZ") +#else +# version=''$(version predict --git) +# buildDate=''$(version date) +#fi +# +#${config.devenv.root}/bin/go-compile.sh \ +# "${config.devenv.root}/source/" \ +# "${config.devenv.root}/dist"/ \ +# "version" \ +# "main" \ +# "''${version}" \ +# "''${buildDate}" +# +# +#''; # This scritp is used to deploy the app to the gitlab registry # It is used by the gitlab-ci.yml file