Merge built artifacts back into main

torfs-ict · Dec 14, 2023 · 47134b8 · 47134b8
1 parent a2297b4
commit 47134b8
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/.github/workflows/flex-update.yml b/.github/workflows/flex-update.yml
@@ -16,7 +16,7 @@ jobs:
       contrib: true
 
   duplicate-index:
-    name: Duplicate index.json into main branch
+    name: Merge updates back into main branch
     runs-on: Ubuntu-20.04
     needs: [call-flex-update]
     steps:
@@ -35,5 +35,7 @@ jobs:
       -
         name: Merge updates back into main branch
         run: | 
-          git merge origin/flex/main
-          git push main
+          git branch
+          git status
+          git merge origin/flex/main -m "Merge built artifacts"
+          git push -u origin main