Przeglądaj źródła

Fix PHP refresh pipeline merge

See https://github.com/PrivateBin/PrivateBin/pull/847#issuecomment-942580850

Now merging the origin as master is not yet pulled.
rugk 4 lat temu
rodzic
commit
af852927a9
1 zmienionych plików z 1 dodań i 1 usunięć
  1. 1 1
      .github/workflows/refresh-php8.yml

+ 1 - 1
.github/workflows/refresh-php8.yml

@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 0
           fetch-depth: 0
 
 
       - name: Merge master changes into php8
       - name: Merge master changes into php8
-        run: git merge master
+        run: git merge origin/master
       
       
       - name: Push new changes
       - name: Push new changes
         uses: github-actions-x/commit@v2.8
         uses: github-actions-x/commit@v2.8