github-ci/fix-beta.sh at v4 · milaboratory/github-ci · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
#!/bin/bash
#
# fix-beta.sh — re-sync v4-beta with v4 after they diverge.
#
# Use when:
#   - Someone committed directly to v4 (bypassing the v4-beta → merge-beta.sh
#     cycle) and you want v4-beta to incorporate those changes.
#   - Post-promotion: v4 has the rename-sed commit from merge-beta.sh that
#     v4-beta does not have; run this script to bring v4-beta back in sync.
#
# What it does:
#   1. Refuses if the working tree is dirty.
#   2. Re-execs itself from a tmp copy so the script survives the checkout.
#   3. Switches to v4-beta, pulls latest.
#   4. Merges v4 in with --strategy-option theirs (v4 content wins on conflict).
#   5. Sed-flips @v4 -> @v4-beta across action.yaml + .github/workflows/*.yaml
#      (mirrors merge-beta.sh's file scope, opposite direction).
#   6. Commits the flip on top of the merge commit and pushes.
#
# Inverse of merge-beta.sh.
#
# Sed safety, two concerns:
#   1. Prefix collision. @v4 is a prefix of @v4-beta, so a naive
#      `s|@v4|@v4-beta|g` would produce @v4-beta-beta. We match @v4 only at
#      end-of-line or followed by whitespace.
#   2. Path scope. We must rewrite only milaboratory/github-ci self-refs.
#      Third-party action pins (actions/checkout@v4, aws-actions/...@v4,
#      pnpm/action-setup@v4, etc.) must stay at their upstream tags — those
#      repos do not publish a v4-beta tag, and flipping them produced the
#      "Unable to resolve action ...@v4-beta" failures fixed in this branch.
# Both patterns therefore anchor the substitution to a leading
# `milaboratory/github-ci...` path.

set -o nounset
set -o errexit
set -o pipefail

: ${TARGET_BRANCH:="v4-beta"}    # branch being fixed
: ${SOURCE_BRANCH:="v4"}         # branch being merged in

if git status --porcelain | grep -q .; then
    echo ""
    echo "# -------------------------------------------------------------- #"
    echo "# Repository has local changes. Automatic merge is not possible. #"
    echo "# -------------------------------------------------------------- #"
    echo ""
    git status --porcelain
    exit 1
fi

if [ "${__REAL_RUN:-}" != "true" ]; then
    echo "Copying script to temporary file to not lose original code during checkouts..."
    tmp_script="$(mktemp)"
    cat "${0}" > "${tmp_script}"
    chmod +x "${tmp_script}"
    __REAL_RUN="true" "${tmp_script}"
    exit 0
fi

echo "Updating remote repository info..."
git fetch --prune origin

echo "Switching to '${TARGET_BRANCH}'..."
git checkout "${TARGET_BRANCH}"
git pull --ff-only

echo "Merging 'origin/${SOURCE_BRANCH}' into '${TARGET_BRANCH}' (theirs wins on conflict)..."
git merge \
    --no-edit \
    --message "Merge ${SOURCE_BRANCH} into ${TARGET_BRANCH}" \
    "origin/${SOURCE_BRANCH}" \
    --strategy-option theirs

echo "Flipping @${SOURCE_BRANCH} -> @${TARGET_BRANCH} in milaboratory/github-ci self-refs..."
{
    find . -type f -name "action.yaml"
    find .github/workflows -type f -name "*.yaml"
} |
    while read -r file; do
        sed "s|\(milaboratory/github-ci[^[:space:]@]*\)@${SOURCE_BRANCH}\$|\1@${TARGET_BRANCH}|g; s|\(milaboratory/github-ci[^[:space:]@]*\)@${SOURCE_BRANCH}\([[:space:]]\)|\1@${TARGET_BRANCH}\2|g" "${file}" > "${file}.tmp"
        mv "${file}.tmp" "${file}"
    done

if git diff --quiet; then
    echo "No ref flips needed; merge alone was sufficient."
else
    git add -A
    git commit -m "Re-flip @${SOURCE_BRANCH} -> @${TARGET_BRANCH} after merging ${SOURCE_BRANCH}"
fi

echo "Pushing '${TARGET_BRANCH}'..."
git push origin "${TARGET_BRANCH}"

echo "Done. ${TARGET_BRANCH} is now in sync with ${SOURCE_BRANCH}, with internal refs restored to @${TARGET_BRANCH}."