Skip to content

Merge main into staging #433

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
github-actions merged 4 commits into from
Sep 23, 2024
Merged

Merge main into staging #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34d2759
Simplify merge strategy for staging (#373)
nrichers Sep 23, 2024
36c9514
I'm dumb (#431)
validbeck Sep 23, 2024
81053aa
Fix branch in merge-main-into-staging.yaml (#432)
nrichers Sep 23, 2024
0b69e1b
Merge remote-tracking branch 'origin/main' into staging
github-actions[bot] Sep 23, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/merge-main-into-staging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
uses: actions/checkout@v3
with:
ref: staging
fetch-depth: 0

- name: Configure git
run: |
Expand All @@ -27,8 +28,7 @@ jobs:

- name: Merge in main branch
run: |
git fetch origin main:main
git merge main --no-ff --allow-unrelated-histories --strategy-option theirs -m "Merging latest changes from main into staging"
git merge --no-ff origin/main

- name: Create pull request
id: pr-number
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,5 @@ make get-source
After you pull in the changes, commit them to this repo as part of the release notes process.

<!-- September 16, 2024: Need to mention rendered Python `.html` docs and generated `.md` test descriptions -->

<!-- Testing simplified merge strategy -->