[CLOUD-131037] enable to specify aux osx runner tags (Cloud-Foundatio…

…ns#13)

Co-authored-by: Dušan Klinec <[email protected]>

.github/workflows/_build-all.yml

@@ -12,6 +12,7 @@ jobs:
     uses: ./.github/workflows/_build-osx.yml
     with:
       official: ${{ inputs.official }}
+      runs-on: ${{ vars.OSX_RUNS_ON }}
     secrets:
       APPLE_DEV_P12_BASE64: ${{ secrets.APPLE_DEV_P12_BASE64 }}
       APPLE_INS_P12_BASE64: ${{ secrets.APPLE_INS_P12_BASE64 }}

.github/workflows/_build-linux.yml

@@ -8,7 +8,7 @@ on:
         type: boolean
 
 jobs:
-  build:
+  build-linux:
     runs-on: [self-hosted, pure1build]
     container:
       image: artifactory.pstg-inf.net:443/dockerhub-registry-1/golang:1.21-bullseye

.github/workflows/_build-osx.yml

@@ -6,6 +6,10 @@ on:
       official:
         required: true
         type: boolean
+      runs-on:
+        description: 'Extra runner tags'
+        type: string
+        required: false
     secrets:
       APPLE_DEV_P12_BASE64:
         required: true
@@ -19,8 +23,8 @@ on:
         required: true
 
 jobs:
-  build:
-    runs-on: [self-hosted, macOS, p1sp]
+  build-osx:
+    runs-on: ${{ fromJson(format('["self-hosted","macOS", {0}]', inputs.runs-on)) }}
     permissions:
       contents: read
       actions: read
@@ -80,10 +84,10 @@ jobs:
         name: keymaster.pkg
         path: keymaster.pkg
 
-  sign:
+  sign-osx:
     runs-on: [ self-hosted, macOS, p1sp ]
     needs:
-      - build
+      - build-osx
     environment: production
     if: inputs.official  # Only sign on the main branch
     permissions:
@@ -147,7 +151,7 @@ jobs:
           pkgbuild \
             --root package \
             --identifier "${{ vars.APPLE_BUNDLE_ID }}" \
-            --version "${{ needs.build.outputs.version }}" \
+            --version "${{ needs.build-osx.outputs.version }}" \
             --install-location /usr/local/bin \
             keymaster-unsigned.pkg
 

.github/workflows/_build-windows.yml

@@ -8,7 +8,7 @@ on:
         type: boolean
 
 jobs:
-  build:
+  build-windows:
     runs-on: [self-hosted, Windows]
     permissions:
       contents: read

Makefile

@@ -10,7 +10,7 @@ endif
 BINARY=keymaster
 
 # These are the values we want to pass for Version and BuildTime
-VERSION?=1.15.10
+VERSION?=1.15.11
 DEFAULT_HOST?=
 VERSION_FLAVOUR?=
 EXTRA_LDFLAGS?=

PureStorage.md

@@ -136,6 +136,7 @@ APPLE_INS_IDENTITY: Developer ID Installer: Pure Storage Inc. (4PQYP85VSU)
 APPLE_ID_INTERMEDIATE_CERT_URL: https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer
 APPLE_TEAM_ID: 4PQYP85VSU
 APPLE_ID: [email protected]
+OSX_RUNS_ON: p1sp
 ```
 
 #### Secrets