Revert "Switch app workflows from ubuntu-latest to ubuntu-24.04 (#73)"

This reverts commit ec853f3.
coreeng · Nov 13, 2024 · 5ca3be2 · 5ca3be2
1 parent ec853f3
commit 5ca3be2
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 33 deletions.
diff --git a/.github/workflows/bump-version.yaml b/.github/workflows/bump-version.yaml
@@ -13,7 +13,7 @@ jobs:
       git-token: ${{ secrets.GITHUB_TOKEN }}
 
   fail:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     if: github.event.action == 'failure'
     steps:
       - name: Exit with error

diff --git a/.github/workflows/internal-cd.yaml b/.github/workflows/internal-cd.yaml
@@ -18,7 +18,7 @@ jobs:
       generate-minor: false
 
   trigger-p2p-build:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     needs: [internal-version]
     env:
       ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}

diff --git a/.github/workflows/internal-ci.yaml b/.github/workflows/internal-ci.yaml
@@ -14,7 +14,7 @@ jobs:
       dry-run: true
 
   print-version:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     needs: increment-version
     steps:
       - env:
@@ -36,7 +36,7 @@ jobs:
     with:
       dry-run: true
     uses: ./.github/workflows/p2p-version.yaml
-
+    
   test_execute_command:
     needs: [test_version]
     uses: ./.github/workflows/p2p-execute-command.yaml
@@ -70,7 +70,7 @@ jobs:
 
   test_extended_test:
     uses: ./.github/workflows/p2p-workflow-extended-test.yaml
-    needs: [get_image_extended_test]
+    needs: [get_image_extended_test] 
     secrets:
       env_vars: |
         TEST_VARIABLE=value

diff --git a/.github/workflows/internal-version.yaml b/.github/workflows/internal-version.yaml
@@ -1,3 +1,4 @@
+
 name: increment-version
 
 on:
@@ -26,25 +27,25 @@ on:
 jobs:
   increment-version:
     name: increment-version
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.setversion.outputs.patch }}
-
+      
     steps:
     - uses: actions/checkout@v4
       with:
-        fetch-depth: 0
+        fetch-depth: 0  
     - name: Configure Git
       run: |
         git config user.name "$GITHUB_ACTOR"
-        git config user.email "[email protected]"
-
+        git config user.email "[email protected]"    
+        
     - name: Get Previous tag
       id: previoustag
       shell: bash
       run: |
-        git tag | sort -r --version-sort | head -n1
-        echo "tag=$(git tag | sort -r --version-sort | head -n1)" >> "$GITHUB_OUTPUT"
+        git tag | sort -r --version-sort | head -n1 
+        echo "tag=$(git tag | sort -r --version-sort | head -n1)" >> "$GITHUB_OUTPUT" 
       env:
         GITHUB_TOKEN: ${{ secrets.git-token }}
 
@@ -58,7 +59,7 @@ jobs:
       id: semvers
       uses: "WyriHaximus/github-action-next-semvers@v1"
       with:
-        version: ${{ inputs.override != ''  && inputs.override || steps.previousversion.outputs.version }}
+        version: ${{ inputs.override != ''  && inputs.override || steps.previousversion.outputs.version }} 
 
     - name: Set bumped version in output
       id: setversion
@@ -67,6 +68,7 @@ jobs:
         echo "patch=${{ steps.semvers.outputs.patch }}" >> "$GITHUB_OUTPUT"
         echo "minor=${{ steps.semvers.outputs.patch }}" | cut -d. -f1,2 >> "$GITHUB_OUTPUT"
         echo "major=${{ steps.semvers.outputs.patch }}" | cut -d. -f1 >> "$GITHUB_OUTPUT"
+        
 
     - name: Show the tags
       shell: bash
@@ -98,3 +100,4 @@ jobs:
       with:
         tag: v${{ steps.setversion.outputs.patch }}
         tag_exists_error: true
+
diff --git a/.github/workflows/p2p-execute-command.yaml b/.github/workflows/p2p-execute-command.yaml
@@ -50,10 +50,11 @@ on:
         type: string
         default: '.'
 
+
 jobs:
   exec:
     name: '${{ inputs.command }} (${{ inputs.github_env }})'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     environment: ${{ inputs.github_env }}
     env:
       env_vars: ${{ secrets.env_vars }}
@@ -86,10 +87,10 @@ jobs:
         if: ${{ inputs.optional == true }}
         working-directory: ${{ inputs.working-directory }}
         id: is_optional
-        run: |
+        run: |          
           declare -r optional_target=${{ inputs.command }}
           # match target in format: `.PHONY: <target_name>`, skip if commented out
-          if grep "^[^#]*.PHONY.*${optional_target}.*" ./Makefile; then
+          if grep "^[^#]*.PHONY.*${optional_target}.*" ./Makefile; then            
             echo "SKIP=false" >> $GITHUB_ENV
           else
             echo "WARNING: No Makefile target [$optional_target], skipping job"
@@ -145,7 +146,7 @@ jobs:
           done
 
       - name: Install iapc
-        uses: jaxxstorm/action-install-gh-release@v1
+        uses: jaxxstorm/action-install-gh-release@v1.10.0
         with:
           repo: cedws/iapc
           tag: v0.1.9

diff --git a/.github/workflows/p2p-get-latest-image-extended-test.yaml b/.github/workflows/p2p-get-latest-image-extended-test.yaml
@@ -1,3 +1,4 @@
+
 on:
   workflow_call:
     secrets:

diff --git a/.github/workflows/p2p-get-latest-image-prod.yaml b/.github/workflows/p2p-get-latest-image-prod.yaml
@@ -1,3 +1,4 @@
+
 on:
   workflow_call:
     secrets:

diff --git a/.github/workflows/p2p-get-latest-image.yaml b/.github/workflows/p2p-get-latest-image.yaml
@@ -33,10 +33,11 @@ on:
         required: true
         type: string
 
+
 jobs:
   get-latest-image:
     name: get-latest-image
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.get-latest-image.outputs.version }}
     environment: ${{ fromJson(inputs.environment).include[0]['deploy_env'] }}
@@ -83,6 +84,6 @@ jobs:
         working-directory: ${{ inputs.working-directory }}
         run: |
             [ $DRY_RUN == false ] && version=$(gcloud container images list-tags ${REGISTRY}/${REGISTRY_PATH}/${IMAGE_NAME} --limit=1 --format=json )
-            [ $? -gt 0 ] && [ $DRY_RUN == false ] && echo "exiting" && exit 1
+            [  $? -gt 0 ] && [ $DRY_RUN == false ] && echo "exiting" && exit 1
             [ $DRY_RUN == true ] && version="[{\"tags\": [\"0.0.0\"]}]"
             echo "version=$(echo ${version} | jq -r '.[0].tags[0]')" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/p2p-promote-image.yaml b/.github/workflows/p2p-promote-image.yaml
@@ -46,9 +46,10 @@ on:
         required: false
         type: string
 
+
 jobs:
   lookup:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     environment: ${{ fromJson(inputs.source_matrix).include[0]['deploy_env'] }}
     env:
       REGISTRY: ${{ inputs.region }}-docker.pkg.dev/${{ vars.PROJECT_ID }}/tenant/${{ vars.TENANT_NAME }}
@@ -67,7 +68,7 @@ jobs:
 
   promote-image:
     name: promote-to-${{ inputs.promotion-stage }}
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     needs: [lookup]
     environment: ${{ inputs.dest_github_env }}
     env:
@@ -98,7 +99,7 @@ jobs:
           yq -p=json -C <<EOT
           ${{ toJSON(env) }}
           EOT
-
+  
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -141,7 +142,7 @@ jobs:
         uses: google-github-actions/setup-gcloud@v2
         with:
           install_components: beta,gke-gcloud-auth-plugin
-
+          
       - name: Setup kubeconfig
         id: setup-kubeconfig
         if: inputs.dry-run == false && inputs.connect-to-k8s == true
@@ -170,7 +171,7 @@ jobs:
           chmod +x corectl
           sudo mv corectl /usr/local/bin/
           rm corectl.tar.gz
-
+          
           corectl help
 
       - name: Decode environment variables
@@ -202,3 +203,4 @@ jobs:
           DEST_ACCESS_TOKEN: ${{ steps.auth-dest.outputs.access_token }}
         run: |
           make p2p-promote-to-${{ inputs.promotion-stage }}
+
diff --git a/.github/workflows/p2p-version.yaml b/.github/workflows/p2p-version.yaml
@@ -30,14 +30,15 @@ on:
         type: string
         default: ''
 
+
 jobs:
   increment-version:
     name: increment-version
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.setversion.outputs.version }}
       previous_version: ${{ steps.setversion.outputs.previous_version }}
-
+      
     steps:
     - uses: actions/checkout@v4
       with:
@@ -46,7 +47,7 @@ jobs:
     - name: Configure Git
       run: |
         git config user.name "$GITHUB_ACTOR"
-        git config user.email "[email protected]"
+        git config user.email "[email protected]"    
 
     - name: Get Previous tag
       id: previoustag
@@ -58,7 +59,8 @@ jobs:
         REGEX=$(echo "^${VERSION_PREFIX}([0-9]+)\.([0-9]+)\.([0-9]+)$")
         PREVIOUS_VERSION=$(git tag | sort -r --version-sort | (grep -E ${REGEX} || echo "") | head -n1 )
         [ -z "$PREVIOUS_VERSION" ] && PREVIOUS_VERSION=${VERSION_PREFIX}0.0.0
-        echo "tag=$PREVIOUS_VERSION" >> "$GITHUB_OUTPUT"
+        echo "tag=$PREVIOUS_VERSION" >> "$GITHUB_OUTPUT" 
+      
 
     - name: get previous version from tag
       id: previousversion
@@ -72,7 +74,7 @@ jobs:
       id: semvers
       uses: "WyriHaximus/github-action-next-semvers@v1"
       with:
-        version: ${{ steps.previousversion.outputs.version }}
+        version: ${{ steps.previousversion.outputs.version }} 
 
     - name: get git hashes
       id: githashes
@@ -108,7 +110,7 @@ jobs:
 
         TAG=${{ steps.semvers.outputs.patch }}
         PREVIOUS_TAG=${{ steps.previousversion.outputs.version }}
-
+ 
         HASH=${{ steps.githashes.outputs.current_hash }}
         LAST_TAG_HASH=${{ steps.githashes.outputs.previous_tag_hash }}
 

diff --git a/.github/workflows/p2p-workflow-extended-test.yaml b/.github/workflows/p2p-workflow-extended-test.yaml
@@ -1,3 +1,4 @@
+
 on:
   workflow_call:
     secrets:
@@ -40,7 +41,7 @@ on:
         type: string
 
 env:
-  REGION: ${{ inputs.region }}
+  REGION: ${{ inputs.region }} 
 
 jobs:
   run-tests:

diff --git a/.github/workflows/p2p-workflow-fastfeedback.yaml b/.github/workflows/p2p-workflow-fastfeedback.yaml
@@ -1,3 +1,4 @@
+
 on:
   workflow_call:
     secrets:
@@ -16,7 +17,7 @@ on:
         required: false
         type: string
         default: ''
-      version:
+      version: 
         required: true
         type: string
       region:
@@ -42,8 +43,9 @@ on:
       version:
         value: ${{ inputs.version }}
 
+
 env:
-  REGION: ${{ inputs.region }}
+  REGION: ${{ inputs.region }} 
 
 jobs:
   build:
@@ -130,3 +132,5 @@ jobs:
       working-directory: ${{ inputs.working-directory }}
       connect-to-k8s: true
       corectl-version: ${{ inputs.corectl-version }}
+
+
diff --git a/.github/workflows/p2p-workflow-prod.yaml b/.github/workflows/p2p-workflow-prod.yaml
@@ -1,3 +1,4 @@
+
 on:
   workflow_call:
     secrets:
@@ -29,6 +30,7 @@ on:
         type: string
         default: 'v'
 
+
 jobs:
   prod-deploy:
     name: prod-deploy
@@ -46,3 +48,5 @@ jobs:
       dry-run: ${{ inputs.dry-run }}
       working-directory: ${{ inputs.working-directory }}
       checkout-version: ${{ inputs.version-prefix }}${{ inputs.version }}
+
+