From 6f501c74b7f958a9c9d044527d8d3f62239e44e4 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Tue, 19 Nov 2024 06:46:43 +0000 Subject: [PATCH] Fix variable typo in continuation --- .gitlab-ci-build.yml.in | 96 ----------------------------------------- nix/continue.nix | 4 +- 2 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 .gitlab-ci-build.yml.in diff --git a/.gitlab-ci-build.yml.in b/.gitlab-ci-build.yml.in deleted file mode 100644 index faac4b5..0000000 --- a/.gitlab-ci-build.yml.in +++ /dev/null @@ -1,96 +0,0 @@ -# vim: set ft=yaml: -stages: - - build - - release - -.build: - stage: build - cache: - - key: - files: - - sources/build.pkr.hcl - paths: - - ./packer_config/ - rules: - - if: $CI_COMMIT_TAG - variables: - EXCEPT: '' - JOB_PREFIX: 'upload' - - if: $CI_COMMIT_TAG =~ "/^$/" - variables: - EXCEPT: '-except=upload' - JOB_PREFIX: 'ci' - needs: - - pipeline: $PARENT_PIPELINE_ID - job: generate - artifacts: true - tags: - - ${tag} - variables: &variables - PACKER_CONFIG_DIR: ./packer_config/ - PACKER_CACHE_DIR: ./cache/ - PACKER_LOG: 1 - script: - - nix run ".#\"${JOB_PREFIX}${buildcmd}\"" || exit 1 - -qemu.amd64: - extends: .build - variables: - <<: *variables - only: "-only=qemu.amd64" - tag: qemu - parallel: - matrix: QEMU_MATRIX - before_script: - - echo $BUILD - - env - -virtualbox-iso.amd64: - extends: .build - variables: - <<: *variables - only: '-only="virtualbox-iso.amd64"' - tag: vbox - parallel: - matrix: VBOX_MATRIX - -hyperv-iso.amd64: - extends: .build - variables: - <<: *variables - only: '-only="hyperv-iso.amd64"' - tag: hyperv - COMMAND: > - packer build ${only} - -var-file="${distro}" - -var build=${BUILD} - -var cpus=2 - -var memory=4096 - ${EXCEPT} - sources - parallel: - matrix: HYPERV_MATRIX - script: - - packer init sources - - echo $env:COMMAND > build.ps1 - - echo 'if (-not $?) { throw "Error in build"}' >> build.ps1 - - pwsh .\build.ps1 - -"Create release": - stage: release - image: registry.gitlab.com/gitlab-org/release-cli:latest - rules: - - if: $CI_COMMIT_TAG - script: echo "Tagging as released" - needs: - - pipeline: $PARENT_PIPELINE_ID - job: continue - artifacts: true - - pipeline: $PARENT_PIPELINE_ID - job: generate - artifacts: true - release: - tag_name: '$CI_COMMIT_TAG' - description: >- - Release $CI_COMMIT_TAG, found on [Vagrant Cloud](https://app.vagrantup.com/boxen/) - as version v${BUILD} diff --git a/nix/continue.nix b/nix/continue.nix index 6f56aef..c820957 100644 --- a/nix/continue.nix +++ b/nix/continue.nix @@ -30,7 +30,7 @@ let "if" = "$CI_COMMIT_TAG =~ \"/^$/\""; variables = { EXCEPT = "-except=upload"; - JOB_PREIX = "ci"; + JOB_PREFIX = "ci"; }; } ]; @@ -42,7 +42,7 @@ let } ]; script = [ - "nix run \".#\\\"\${JOB_PREIX}\${buildcmd}\\\"\" || exit 1" + "nix run \".#\\\"\${JOB_PREFIX}\${buildcmd}\\\"\" || exit 1" ]; };