removes upstream version from build-nix-image and full-nix

Author: timbastin

.github/workflows/build-nix-image.yml

@@ -55,11 +55,11 @@ on:
         required: false
         type: string
         default: ''
-      upstream-version:
-        description: 'Upstream version passed to devguard-scanner generate-tag (matches the nix package version segment, e.g. 0)'
+      runner:
+        description: 'GitHub Actions runner label to use (e.g. ubuntu-latest, ubuntu-24.04-arm)'
         required: false
         type: string
-        default: '0'
+        default: 'ubuntu-latest'
     secrets:
       devguard-token:
         required: false
@@ -82,7 +82,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.runner }}
     outputs:
       image-tag: ${{ steps.set-image-tag.outputs.image_tag }}
       image-digest: ${{ steps.get-digest.outputs.digest }}
@@ -154,7 +154,6 @@ jobs:
               devguard-scanner generate-tag
                 --imagePath='${{ inputs.image-name }}'
                 --ref='${{ github.ref_name }}'
-                --upstreamVersion='${{ inputs.upstream-version }}'
                 --architecture='${{ inputs.arch }}'
               >> image-tag-env.txt
               IMAGE_TAG=$(grep '^IMAGE_TAG=' image-tag-env.txt | cut -d= -f2-)

.github/workflows/full-nix.yml

@@ -15,11 +15,6 @@ on:
         description: 'Full OCI image name without tag (e.g. ghcr.io/l3montree-dev/devguard)'
         required: true
         type: string
-      upstream-version:
-        description: 'Upstream version segment used by generate-tag (matches the nix package version, e.g. 0)'
-        required: false
-        type: string
-        default: '0'
       artifact-name-suffix:
         description: 'Suffix appended to artifact names to avoid conflicts when building multiple images in the same workflow'
         required: false
@@ -54,6 +49,16 @@ on:
         required: false
         type: boolean
         default: true
+      runner-amd64:
+        description: 'GitHub Actions runner label for the amd64 build'
+        required: false
+        type: string
+        default: 'ubuntu-latest'
+      runner-arm64:
+        description: 'GitHub Actions runner label for the arm64 build'
+        required: false
+        type: string
+        default: 'ubuntu-24.04-arm'
       nix-cache-substituter:
         description: 'Nix binary cache substituter URL'
         required: false
@@ -109,7 +114,7 @@ jobs:
       asset-name: ${{ inputs.asset-name }}
       api-url: ${{ inputs.api-url }}
       arch: amd64
-      upstream-version: ${{ inputs.upstream-version }}
+      runner: ${{ inputs.runner-amd64 }}
       nix-cache-substituter: ${{ inputs.nix-cache-substituter }}
       nix-cache-public-key: ${{ inputs.nix-cache-public-key }}
       nix-cache-s3-endpoint: ${{ inputs.nix-cache-s3-endpoint }}
@@ -132,7 +137,7 @@ jobs:
       asset-name: ${{ inputs.asset-name }}
       api-url: ${{ inputs.api-url }}
       arch: arm64
-      upstream-version: ${{ inputs.upstream-version }}
+      runner: ${{ inputs.runner-arm64 }}
       nix-cache-substituter: ${{ inputs.nix-cache-substituter }}
       nix-cache-public-key: ${{ inputs.nix-cache-public-key }}
       nix-cache-s3-endpoint: ${{ inputs.nix-cache-s3-endpoint }}