Refactor (ci): Use a job_group_key to group jobs

theohbrothers · Sep 25, 2023 · c07d03a · c07d03a
1 parent b9bb424
commit c07d03a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml
@@ -14,7 +14,7 @@ jobs:
   test-nogitdiff:
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/powershell:7.2.2-alpine-3.14-20220318
+      image: mcr.microsoft.com/powershell:lts-7.2-alpine-3.17
     steps:
     - run: |
         apk add --no-cache git

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -11,10 +11,7 @@
                 "-c",
                 "Generate-DockerImageVariants ."
             ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            }
+            "group": "build"
         },
         {
             "label": "Install DockerImageVariants module",

diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
@@ -38,12 +38,11 @@ $VARIANTS = @(
                     package = $package
                     package_version = $package_version
                     platforms = 'linux/amd64'
+                    job_group_key = $package_version
                 }
                 tag = "v$package_version-$package"
                 # The latest cloudflare image will be tagged :latest. E.g. v1.12.0-cloudflare
                 tag_as_latest = if ($package -eq 'cloudflare' -and $package_version -eq $local:PACKAGE_VERSIONS[0]) { $true } else { $false }
-
-
                 buildContextFiles = @{
                     templates = @{
                         'Dockerfile' = @{

diff --git a/generate/templates/.github/workflows/ci-master-pr.yml.ps1 b/generate/templates/.github/workflows/ci-master-pr.yml.ps1
@@ -15,7 +15,7 @@ jobs:
   test-nogitdiff:
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/powershell:7.2.2-alpine-3.14-20220318
+      image: mcr.microsoft.com/powershell:lts-7.2-alpine-3.17
     steps:
     - run: |
         apk add --no-cache git
@@ -36,7 +36,7 @@ jobs:
 '@
 
 # Group variants by the package version
-$groups = $VARIANTS | Group-Object -Property { $_['_metadata']['package_version'] } | Sort-Object -Property { [version]$_.Name } -Descending
+$groups = $VARIANTS | Group-Object -Property { $_['_metadata']['job_group_key'] } | Sort-Object { [version]$_.Name.Split('-')[0] } -Descending
 $WORKFLOW_JOB_NAMES = $groups | % { "build-$( $_.Name.Replace('.', '-') )" }
 foreach ($g in $groups) {
 @"