diff options
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/builds.yml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 6c9df8950..3d5fcfd2c 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml | |||
@@ -105,15 +105,12 @@ jobs: | |||
105 | run: | | 105 | run: | |
106 | echo "NPM_CACHE=$HOME/.npm" >> $GITHUB_ENV | 106 | echo "NPM_CACHE=$HOME/.npm" >> $GITHUB_ENV |
107 | echo "PNPM_CACHE=$HOME/.pnpm-store" >> $GITHUB_ENV | 107 | echo "PNPM_CACHE=$HOME/.pnpm-store" >> $GITHUB_ENV |
108 | - name: Checkout code along with submodules | 108 | - name: Checkout code along with submodules for the develop branch |
109 | uses: actions/checkout@v3 | 109 | uses: actions/checkout@v3 |
110 | with: | 110 | with: |
111 | ref: develop | ||
111 | submodules: recursive | 112 | submodules: recursive |
112 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging | 113 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging |
113 | - name: Extract Git branch name and commit from the currently checked out branch (not from the branch where this run was kicked off) | ||
114 | run: | | ||
115 | echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV | ||
116 | shell: bash | ||
117 | - name: Use Node.js specified in the '.nvmrc' file | 114 | - name: Use Node.js specified in the '.nvmrc' file |
118 | uses: actions/setup-node@v3 | 115 | uses: actions/setup-node@v3 |
119 | with: | 116 | with: |
@@ -148,7 +145,7 @@ jobs: | |||
148 | git commit -am "Update submodules, browserslist data updates and linter fixes [skip ci]" --no-verify || true | 145 | git commit -am "Update submodules, browserslist data updates and linter fixes [skip ci]" --no-verify || true |
149 | - name: Push all changes | 146 | - name: Push all changes |
150 | if: ${{ env.GIT_DIRTY != '0' }} | 147 | if: ${{ env.GIT_DIRTY != '0' }} |
151 | run: git push origin ${{ env.GIT_BRANCH_NAME }} --no-verify | 148 | run: git push origin develop --no-verify |
152 | 149 | ||
153 | build_mac: | 150 | build_mac: |
154 | name: "macos ${{ github.event.inputs.message }}" | 151 | name: "macos ${{ github.event.inputs.message }}" |