Skip to content

Commit 08d5ceb

Browse files
committed
ci: enforce three-branch source parity
1 parent 6f76d62 commit 08d5ceb

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ jobs:
2828
- name: Checkout source
2929
uses: actions/checkout@v7
3030

31+
- name: Verify three-branch source parity
32+
run: bash scripts/check-branch-parity.sh
33+
3134
- name: Set up JDK 21
3235
uses: actions/setup-java@v5
3336
with:

‎scripts/check-branch-parity.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/sh
22
set -eu
33

4-
ROOT="$(git rev-parse --show-toplevel)"
54
TMP="$(mktemp -d)"
65
trap 'rm -rf "$TMP"' EXIT
76

@@ -14,8 +13,9 @@ extract_branch() {
1413
ref="$1"
1514
dir="$2"
1615
mkdir -p "$TMP/$dir"
17-
git archive --format=tar "$ref" src/main/java src/test/java src/test/resources/comfy-parity-manifest.json \
16+
git archive --format=tar "$ref" src/main/java src/test/java src/test/resources \
1817
| tar -xf - -C "$TMP/$dir"
18+
1919
find "$TMP/$dir" -type f -name '*.java' -print | while IFS= read -r file; do
2020
sed 's/tools\.jackson/com.fasterxml.jackson/g' "$file" > "$file.norm"
2121
mv "$file.norm" "$file"
@@ -29,4 +29,4 @@ extract_branch origin/feature/3.0.x b3
2929
diff -ru "$TMP/b1/src" "$TMP/b2/src"
3030
diff -ru "$TMP/b2/src" "$TMP/b3/src"
3131

32-
echo "three-branch source and capability parity: OK"
32+
echo "three-branch source/test/fixture parity: OK"

0 commit comments

Comments
 (0)