use contemporary git from new builder image

openziti · Aug 21, 2023 · 5469945 · 5469945
1 parent 77dcb27
commit 5469945
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -4,7 +4,16 @@ on:
   pull_request:
     branches: [ main ]
   workflow_dispatch:
+    inputs:
+      ziti-builder:
+        description: 'Builder image to use'
+        default: 'kbinghamnetfoundry/ziti-builder'
+        #default: 'openziti/ziti-builder:1.0.3'
   workflow_call:
+      # ziti-builder:
+      #   description: 'Builder image to use'
+      #   default: 'kbinghamnetfoundry/ziti-builder'
+        # default: 'openziti/ziti-builder:1.0.3'
 
 # cancel older, redundant runs of same workflow on same branch
 concurrency:
@@ -39,34 +48,21 @@ jobs:
             preset: windows-arm64
 
           - os: ubuntu-20.04
-            container: openziti/ziti-builder:1.0.3
+            container: ${{ inputs.ziti-builder || github.event.inputs.ziti-builder }}
             name: Linux x86_64
             preset: linux-x64-static-libssl
 
           - os: ubuntu-20.04
-            container: openziti/ziti-builder:1.0.3
+            container: ${{ inputs.ziti-builder || github.event.inputs.ziti-builder }}
             name: Linux arm
             preset: linux-arm-static-libssl
 
           - os: ubuntu-20.04
-            container: openziti/ziti-builder:1.0.3
+            container: ${{ inputs.ziti-builder || github.event.inputs.ziti-builder }}
             name: Linux arm64
             preset: linux-arm64-static-libssl
 
     steps:
-      # only focal-20.04 has >= 2.18, which is required by actions/checkout to clone
-      # which enables cmake version discovery. remove this step when openziti:ziti-builder
-      # is upgraded to a version that contains git 2.18+
-      - name: install contemporary Git if using ziti-builder
-        if: ${{ startsWith(matrix.container, 'openziti/ziti-builder') }}
-        run: |
-          apt -y update
-          apt-get -y install software-properties-common
-          add-apt-repository -y ppa:git-core/ppa
-          apt -y update
-          apt -y install git
-          git --version
-
       - name: checkout workspace
         uses: actions/checkout@v3
         with: