Try to use a composite action to reduce duplication

neondatabase · Sep 16, 2024 · 24dd191 · 24dd191
1 parent d3515b7
commit 24dd191
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 26 deletions.
diff --git a/.github/actions/check-submodule-reference/action.yml b/.github/actions/check-submodule-reference/action.yml
@@ -0,0 +1,25 @@
+name: 'Check submodule reference'
+description: 'Check that submodule references a commit in a submodule repository's branch'
+
+inputs:
+  submodule_path:
+    description: 'directory with the submodule'
+    required: true
+  branch:
+    description: 'branch in the submodule repository'
+    required: true
+
+runs:
+  using: "composite"
+
+  steps:
+    - name: Check ${{ inputs.submodule_path }} submodule reference
+      shell: bash -euxo pipefail {0}
+      run: |
+        cd ${{ inputs.submodule_path }}
+        git fetch origin "refs/heads/${{ inputs.branch }}:refs/heads/origin/${{ inputs.branch }}"
+        RC=$(git merge-base --is-ancestor origin/${{ inputs.branch }} HEAD; echo $?)
+        if [ "$RC" != "0" ]; then
+          echo "${{ inputs.submodule_path }} submodule is not an ancestor of the ${{ inputs.branch }} branch. Please rebase it"
+          exit 1
+        fi
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -138,36 +138,28 @@ jobs:
 
       - name: Check vendor/postgres-v14 submodule reference
         id: postgres-v14-submodule
-        run: |
-            cd vendor/postgres-v14
-            git fetch origin "refs/heads/REL_14_STABLE_neon:refs/heads/origin/REL_14_STABLE_neon"
-            RC=$(git merge-base --is-ancestor origin/REL_14_STABLE_neon HEAD; echo $?)
-            if [ "$RC" != "0" ]; then
-              echo "vendor/postgres-v14 submodule is not an ancestor of the REL_14_STABLE_neon branch. Please rebase it"
-              exit 1
-            fi
+        uses: ./.github/actions/check-submodule-reference
+        with:
+          submodule_path: vendor/postgres-v14
+          branch: REL_14_STABLE_neon
 
       - name: Check vendor/postgres-v15 submodule reference
-        id: postgres-v15-submodule
-        run: |
-            cd vendor/postgres-v15
-            git fetch origin "refs/heads/REL_14_STABLE_neon:refs/heads/origin/REL_14_STABLE_neon"
-            RC=$(git merge-base --is-ancestor origin/REL_14_STABLE_neon HEAD; echo $?)
-            if [ "$RC" != "0" ]; then
-              echo "vendor/postgres-v15 submodule is not an ancestor of the REL_14_STABLE_neon branch. Please rebase it"
-              exit 1
-            fi
+        uses: ./.github/actions/check-submodule-reference
+        with:
+          submodule_path: vendor/postgres-v15
+          branch: REL_15_STABLE_neon
 
       - name: Check vendor/postgres-v16 submodule reference
-        id: postgres-v16-submodule
-        run: |
-            cd vendor/postgres-v16
-            git fetch origin "refs/heads/REL_14_STABLE_neon:refs/heads/origin/REL_14_STABLE_neon"
-            RC=$(git merge-base --is-ancestor origin/REL_14_STABLE_neon HEAD; echo $?)
-            if [ "$RC" != "0" ]; then
-              echo "vendor/postgres-v16 submodule is not an ancestor of the REL_14_STABLE_neon branch. Please rebase it"
-              exit 1
-            fi
+        uses: ./.github/actions/check-submodule-reference
+        with:
+          submodule_path: vendor/postgres-v16
+          branch: REL_16_STABLE_neon
+
+      - name: Check vendor/postgres-v17 submodule reference
+        uses: ./.github/actions/check-submodule-reference
+        with:
+          submodule_path: vendor/postgres-v17
+          branch: REL_17_STABLE_neon
 
   check-codestyle-rust:
     needs: [ check-permissions, build-build-tools-image ]