Skip to content

fix(ci): rebase onto main before pushing update commits #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LuisAlejandro merged 1 commit into from
Jul 9, 2026
Merged

fix(ci): rebase onto main before pushing update commits #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions .github/workflows/update-meta-gbp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,17 @@ jobs:
- name: meta-gbp update
run: python-pipeline/meta-gbp update --no-interactive

- name: Export revision
id: rev
run: |
echo "rev=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
echo "py=$(echo '${{ github.repository }}' | cut -d/ -f2 | sed 's/^py//')" >> "$GITHUB_OUTPUT"
echo "py_repo_dir=$GITHUB_WORKSPACE" >> "$GITHUB_OUTPUT"

# Fetch/rebase before exporting rev so build/smoke/publish use the SHA that lands on main.
# Stale origin/main (e.g. commits pushed after checkout) used to cause non-fast-forward push failures.
- name: Push update commits
run: |
git remote set-url origin "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git"
git fetch origin main
if git rev-parse origin/main >/dev/null 2>&1; then
behind="$(git rev-list --count HEAD..origin/main || true)"
if [[ "${behind}" != "0" ]]; then
git rebase origin/main
fi
ahead="$(git rev-list --count origin/main..HEAD || true)"
else
ahead="$(git rev-list --count HEAD || true)"
Expand All @@ -91,6 +91,13 @@ jobs:
git push origin HEAD:main
fi

- name: Export revision
id: rev
run: |
echo "rev=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
echo "py=$(echo '${{ github.repository }}' | cut -d/ -f2 | sed 's/^py//')" >> "$GITHUB_OUTPUT"
echo "py_repo_dir=$GITHUB_WORKSPACE" >> "$GITHUB_OUTPUT"

build:
needs: update
runs-on: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
Expand Down
1 change: 1 addition & 0 deletions docs/ci.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ Scheduled runs publish when `DEPLOY_SSH_KEY` is configured. Use `workflow_dispat
| Failure | Action |
|---------|--------|
| `meta-gbp update` rebase conflict | Resolve locally, push fix, re-run workflow |
| Push update commits non-fast-forward | Workflow fetches `main` and rebases before push; if rebase conflicts, resolve locally and re-run |
| Builder image pull fails | CI falls back to `make build-tools-image build-builder-images` (slow) |
| Smoke test `apt-get -f install` fails | Check missing runtime deps in generated `.deb` set |
| Publish SSH/rsync fails | Verify `DEPLOY_*` variables and `DEPLOY_SSH_KEY` |
Expand Down
Loading