greg/vms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll back pwsh changes

Browse Source
This commit is contained in:
Greg Hellings
2024-01-17 14:49:15 -06:00
parent 9a38d88ba8
commit 6845032db6
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci-build.yml.in
+10 -7
View File
@@ -35,7 +35,7 @@ stages:
PACKER_LOG: 0 PACKER_LOG: 0
COMMAND: > COMMAND: >
packer build ${only} packer build ${only}
-var-file=${distro} -var-file="${distro}"
-var build=${BUILD} -var build=${BUILD}
-var cpus=2 -var cpus=2
-var memory=4096 -var memory=4096
@@ -45,8 +45,9 @@ stages:
- packer init sources - packer init sources
- echo $COMMAND - echo $COMMAND
script: script:
- export EFI_DIR="$(dirname "$(find /nix/store -name OVMF_VARS.fd | head -1)")/" - export EFI_DIR="$(dirname "$(find / -name OVMF_VARS.fd | head -1)")/"
- $COMMAND || exit 1 - echo $COMMAND > build.sh
- bash build.sh || exit 1
qemu.amd64: qemu.amd64:
extends: .build extends: .build
@@ -74,16 +75,18 @@ hyperv-iso.amd64:
extends: .build extends: .build
variables: variables:
<<: *variables <<: *variables
only: '-only=hyperv-iso.amd64' only: '-only="hyperv-iso.amd64"'
tag: hyperv tag: hyperv
parallel: parallel:
matrix: [] matrix: []
script: script:
- $COMMAND || exit 1 - echo $env:COMMAND > build.ps1
- echo 'if (-not $?) { throw "Error in build"}' >> build.ps1
- pwsh .\build.ps1
after_script: |- after_script: |-
if [ "$CI_JOB_STATUS" == "success" ]; then if ( "$CI_JOB_STATUS" -eq "success" ) {
xonsh test.xsh xonsh test.xsh
fi }
"Create release": "Create release":
stage: release stage: release