Switch to existing jtmullen/submodule-branch-check-action

This commit is contained in:
Heikki Linnakangas
2024-09-17 00:10:25 +03:00
parent d8851806b7
commit e7e351377e
2 changed files with 28 additions and 43 deletions

View File

@@ -1,25 +0,0 @@
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

View File

@@ -130,35 +130,45 @@ jobs:
with:
submodules: true
# We need more history, to find the common ancestor between each REL_14_* branch.
# 3 months should be plenty.
- name: Checkout more history
id: checkout-deeper
run: git submodule foreach git fetch --shallow-since='3 months'
- name: Check vendor/postgres-v14 submodule reference
uses: ./.github/actions/check-submodule-reference
uses: jtmullen/submodule-branch-check-action@v1
with:
submodule_path: vendor/postgres-v14
branch: REL_14_STABLE_neon
path: "vendor/postgres-v14"
branch: "REL_14_STABLE_neon"
fetch_depth: "50"
sub_fetch_depth: "50"
first_parent: true
pass_if_unchanged: true
- name: Check vendor/postgres-v15 submodule reference
uses: ./.github/actions/check-submodule-reference
uses: jtmullen/submodule-branch-check-action@v1
with:
submodule_path: vendor/postgres-v15
branch: REL_15_STABLE_neon
path: "vendor/postgres-v15"
branch: "REL_15_STABLE_neon"
fetch_depth: "50"
sub_fetch_depth: "50"
first_parent: true
pass_if_unchanged: true
- name: Check vendor/postgres-v16 submodule reference
uses: ./.github/actions/check-submodule-reference
uses: jtmullen/submodule-branch-check-action@v1
with:
submodule_path: vendor/postgres-v16
branch: REL_16_STABLE_neon
path: "vendor/postgres-v16"
branch: "REL_16_STABLE_neon"
fetch_depth: "50"
sub_fetch_depth: "50"
first_parent: true
pass_if_unchanged: true
- name: Check vendor/postgres-v17 submodule reference
uses: ./.github/actions/check-submodule-reference
uses: jtmullen/submodule-branch-check-action@v1
with:
submodule_path: vendor/postgres-v17
branch: REL_17_STABLE_neon
path: "vendor/postgres-v17"
branch: "REL_17_STABLE_neon"
fetch_depth: "50"
sub_fetch_depth: "50"
first_parent: true
pass_if_unchanged: true
check-codestyle-rust:
needs: [ check-permissions, build-build-tools-image ]