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

Be capable of running build vs upload

Browse Source
This commit is contained in:
Greg Hellings
2024-07-22 10:34:22 -05:00
parent 7561d51f26
commit d243a0f5bd
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci-build.yml.in
+3 -1
View File
@@ -15,9 +15,11 @@ stages:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
variables: variables:
EXCEPT: '' EXCEPT: ''
JOB_PREFIX: 'ci'
- if: $CI_COMMIT_TAG =~ "/^$/" - if: $CI_COMMIT_TAG =~ "/^$/"
variables: variables:
EXCEPT: '-except=upload' EXCEPT: '-except=upload'
JOB_PREIX: 'upload'
needs: needs:
- pipeline: $PARENT_PIPELINE_ID - pipeline: $PARENT_PIPELINE_ID
job: continue job: continue
@@ -32,7 +34,7 @@ stages:
PACKER_CACHE_DIR: ./cache/ PACKER_CACHE_DIR: ./cache/
PACKER_LOG: 1 PACKER_LOG: 1
script: script:
- nix run ".#\"${buildcmd}\"" || exit 1 - nix run ".#\"${JOB_PREIX}${buildcmd}\"" || exit 1
qemu.amd64: qemu.amd64:
extends: .build extends: .build
flake.nix
+2 -2
View File
@@ -131,8 +131,8 @@
builds = lib.lists.foldr (d: acc: acc // { "build${name d}" = (build d); }) {} withProviders; builds = lib.lists.foldr (d: acc: acc // { "build${name d}" = (build d); }) {} withProviders;
uploads = lib.lists.foldr (d: acc: acc // { "upload${name d}" = (upload d); }) {} withProviders; uploads = lib.lists.foldr (d: acc: acc // { "upload${name d}" = (upload d); }) {} withProviders;
cibuilds = lib.lists.foldr (d: acc: acc // { "ci${name d}" = (cibuild d); }) {} withProviders; cibuilds = lib.lists.foldr (d: acc: acc // { "ci${name d}" = (cibuild d); }) {} withProviders;
qemu_list = builtins.toJSON (builtins.map (d: { buildcmd = "ci${name d}"; }) (builtins.filter (x: x.provider == "qemu") active)); qemu_list = builtins.toJSON (builtins.map (d: { buildcmd = (name d); }) (builtins.filter (x: x.provider == "qemu") active));
vbox_list = builtins.toJSON (builtins.map (d: { buildcmd = "ci${name d}"; }) (builtins.filter (x: x.provider == "virtualbox-iso") active)); vbox_list = builtins.toJSON (builtins.map (d: { buildcmd = (name d); }) (builtins.filter (x: x.provider == "virtualbox-iso") active));
hyperv_list = builtins.toJSON (builtins.map (d: { distro = distroFile d; }) (builtins.filter (x: x.provider == "hyperv-iso") active)); hyperv_list = builtins.toJSON (builtins.map (d: { distro = distroFile d; }) (builtins.filter (x: x.provider == "hyperv-iso") active));
in builds // uploads // cibuilds // { in builds // uploads // cibuilds // {
continue = pkgs.writeText "continue.yml" continue = pkgs.writeText "continue.yml"