diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4899375e..00303fec 100644 --- 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 index 39499027..83f0bce6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "iam-client-lib", - "version": "3.2.0-alpha.8", + "version": "3.3.0-alpha.4", "lockfileVersion": 1, "requires": true, "dependencies": {