Skip to content
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

Jump to bottom

[da-939] Create merge-main-into-small-image.yml #22

Merged
merged 2 commits into from
Nov 13, 2023
Merged

[da-939] Create merge-main-into-small-image.yml #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93806da
Create merge-main-into-small-image.yml
marisimon Nov 2, 2023
70f66bb
Update merge-main-into-small-image.yml
marisimon Nov 2, 2023
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: 21 additions & 0 deletions .github/workflows/merge-main-into-small-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: merge-main-into-small-image.yml
on:
pull_request:
branches:
- main
types:
- closed
jobs:
merge-main-into-small-image:
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true
timeout-minutes: 3

steps:
- uses: actions/checkout@v4
- name: Merge with main
run: |
git fetch
git checkout small-image
git merge main --no-ff --no-edit
Copy link
Contributor Author

@marisimon marisimon Nov 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tested it on a private personal repo. It should work unless there are merge conflicts. Need to merge it to test it here ➿

git push origin small-image
Loading