diff --git a/.gitignore b/.gitignore index c51599b..1e1b574 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ cache venv .gitlab-ci-build.yml +build.env diff --git a/.gitlab-ci-build.yml.in b/.gitlab-ci-build.yml.in index f1dd5f0..2d86b08 100644 --- a/.gitlab-ci-build.yml.in +++ b/.gitlab-ci-build.yml.in @@ -63,7 +63,7 @@ hyperv-iso.amd64: COMMAND: > packer build ${only} -var-file="${distro}" - -var build=${CI_COMMIT_TAG} + -var build=${BUILD} -var cpus=2 -var memory=4096 ${EXCEPT} @@ -90,5 +90,5 @@ hyperv-iso.amd64: tag_name: '$CI_COMMIT_TAG' description: >- Release $CI_COMMIT_TAG, found on [Vagrant Cloud](https://app.vagrantup.com/boxen/) - as version v${CI_COMMIT_TAG} + as version v${BUILD} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ce6a85..5eabab2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,8 @@ generate: artifacts: paths: - distros/**/*.pkrvars.hcl + reports: + dotenv: build.env script: nix run ".#generate" continue: diff --git a/flake.nix b/flake.nix index 619e3cd..ea8b3d2 100644 --- a/flake.nix +++ b/flake.nix @@ -154,6 +154,7 @@ name = "generate"; runtimeInputs = with pkgs; [ bash + coreutils curl jq pup @@ -163,6 +164,8 @@ for vars in distros/**/*.pkrvars.hcl.sh; do bash "./''${vars}" done + BUILD="$(date "+%Y.%m.%d.%H")" + echo "BUILD=$BUILD" >> build.env ''; }; shellcheck = pkgs.writeShellApplication {