Skip to content

Commit

Permalink
Properly reference master branch on central repo
Browse files Browse the repository at this point in the history
As well as the the repo and branch of the PR
  • Loading branch information
hqpho committed Nov 5, 2024
1 parent 3d069c4 commit 4e90b61
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/all-commits-in-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,20 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Fetch all history for accurate comparison
# Fetch all history for accurate comparison
fetch-depth: 0
# Check out the PR branch
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}

- name: Check if commits exist in master
run: |
git remote add dc https://github.com/datacommonsorg/website.git
git fetch dc
MASTER_BRANCH="remotes/dc/master"
SOURCE_BRANCH=$(echo ${{ github.head_ref }})
MASTER_BRANCH="dc/master"
# Get the list of commits in the source branch that are not in the master branch
MISSING_COMMITS=$(git log --pretty="%H - %s" $MASTER_BRANCH..$SOURCE_BRANCH --)
MISSING_COMMITS=$(git log --no-merges --pretty="%H - %s" $MASTER_BRANCH..HEAD --)
if [[ -n "$MISSING_COMMITS" ]]; then
echo "ERROR: The following commits are not present in $MASTER_BRANCH:"
Expand Down

0 comments on commit 4e90b61

Please sign in to comment.