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

* Create merge-main-into-small-image.yml Configure GithubActions workflow that merges main into small-image whenever a pull request is merged into main. * Update merge-main-into-small-image.yml
docker · Nov 13, 2023 · 6f3d86f · 6f3d86f
1 parent 4909745
commit 6f3d86f
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/.github/workflows/merge-main-into-small-image.yml b/.github/workflows/merge-main-into-small-image.yml
@@ -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
+        git push origin small-image