From 6845032db6e2cd3e76992178d7fda7c137af9a70 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 17 Jan 2024 14:49:15 -0600 Subject: [PATCH] Roll back pwsh changes --- .gitlab-ci-build.yml.in | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci-build.yml.in b/.gitlab-ci-build.yml.in index 4a4548f..0db281c 100644 --- a/.gitlab-ci-build.yml.in +++ b/.gitlab-ci-build.yml.in @@ -35,7 +35,7 @@ stages: PACKER_LOG: 0 COMMAND: > packer build ${only} - -var-file=${distro} + -var-file="${distro}" -var build=${BUILD} -var cpus=2 -var memory=4096 @@ -45,8 +45,9 @@ stages: - packer init sources - echo $COMMAND script: - - export EFI_DIR="$(dirname "$(find /nix/store -name OVMF_VARS.fd | head -1)")/" - - $COMMAND || exit 1 + - export EFI_DIR="$(dirname "$(find / -name OVMF_VARS.fd | head -1)")/" + - echo $COMMAND > build.sh + - bash build.sh || exit 1 qemu.amd64: extends: .build @@ -74,16 +75,18 @@ hyperv-iso.amd64: extends: .build variables: <<: *variables - only: '-only=hyperv-iso.amd64' + only: '-only="hyperv-iso.amd64"' tag: hyperv parallel: matrix: [] script: - - $COMMAND || exit 1 + - echo $env:COMMAND > build.ps1 + - echo 'if (-not $?) { throw "Error in build"}' >> build.ps1 + - pwsh .\build.ps1 after_script: |- - if [ "$CI_JOB_STATUS" == "success" ]; then + if ( "$CI_JOB_STATUS" -eq "success" ) { xonsh test.xsh - fi + } "Create release": stage: release