fix: merge updated master to develop

energywebfoundation · Nov 3, 2021 · 5f1a3fc · 5f1a3fc
1 parent 0d1bda5
commit 5f1a3fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -63,7 +63,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.SECRET_NAME }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-      - name: Commit to develop branch and merge to master branch
+      - name: Merge master into develop
+        if: github.ref == 'refs/heads/master'
         run: |
           git checkout develop
           sudo chown $(id -u) .git/logs/refs/heads/develop

diff --git a/package-lock.json b/package-lock.json