[PR #1030] [MERGED] CI: Fix "Update contributors list" action failing on non-fast-forward #7939

New Issue

GiteaMirror · 2026-04-27T17:12:19-05:00

GiteaMirror commented

2026-04-27 17:12:19 -05:00

📋 Pull Request Information

Original PR: https://github.com/harvard-edge/cs249r_book/pull/1030
Author: @oamazonasgabriel
Created: 11/4/2025
Status: ✅ Merged
Merged: 11/5/2025
Merged by: @profvjreddi

Base: dev ← Head: patch-2

📝 Commits (3)

b1994ab Fix git add command in update-contributors.yml
4bde036 Fix missing newline at end of update-contributors.yml
3f1b37d removes the final line

📊 Changes

1 file changed (+1 additions, -0 deletions)

View changed files

📝 .github/workflows/update-contributors.yml (+1 -0)

📄 Description

Description:
Hello! This PR fixes a race condition in the “Update contributors list” workflow.

The Problem:
The action was failing with a non-fast-forward Git error.
This happens when another PR or commit lands on dev while this workflow is still running, leaving the workflow’s local branch out of date.

The Solution:
Added a git pull --rebase origin "$BRANCH_NAME" command right before the push step.
This ensures the workflow rebases its local changes on top of the latest dev before pushing.

The indication:

These two PRs being merged close

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/harvard-edge/cs249r_book/pull/1030 **Author:** [@oamazonasgabriel](https://github.com/oamazonasgabriel) **Created:** 11/4/2025 **Status:** ✅ Merged **Merged:** 11/5/2025 **Merged by:** [@profvjreddi](https://github.com/profvjreddi) **Base:** `dev` ← **Head:** `patch-2` --- ### 📝 Commits (3) - [`b1994ab`](https://github.com/harvard-edge/cs249r_book/commit/b1994ab093d10d5db7dd8f78e6e5fe32efa3ae93) Fix git add command in update-contributors.yml - [`4bde036`](https://github.com/harvard-edge/cs249r_book/commit/4bde03679b9222d61dbce4db7753ca0ea1265677) Fix missing newline at end of update-contributors.yml - [`3f1b37d`](https://github.com/harvard-edge/cs249r_book/commit/3f1b37d8224d9413d545a4965ce747987f7f83e8) removes the final line ### 📊 Changes **1 file changed** (+1 additions, -0 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/update-contributors.yml` (+1 -0) </details> ### 📄 Description Description: Hello! This PR fixes a race condition in the “Update contributors list” workflow. The Problem: The action was failing with a non-fast-forward Git error. This happens when another PR or commit lands on dev while this workflow is still running, leaving the workflow’s local branch out of date. The Solution: Added a git pull --rebase origin "$BRANCH_NAME" command right before the push step. This ensures the workflow rebases its local changes on top of the latest dev before pushing. The indication: These two PRs being merged close <img width="467" height="189" alt="Screenshot 2025-11-04 at 20 07 06" src="https://github.com/user-attachments/assets/d56654e2-c1b2-409e-b3fc-405b3e6cd7eb" /> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

GiteaMirror added the pull-request label 2026-04-27 17:12:20 -05:00

GiteaMirror closed this issue

2026-04-27 17:12:23 -05:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/cs249r_book#7939