diff options
-rw-r--r-- | .github/workflows/builds.yml | 20 | ||||
-rw-r--r-- | .github/workflows/tag-repos.yml | 28 |
2 files changed, 29 insertions, 19 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 8d3a7646f..1c0035090 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml | |||
@@ -155,14 +155,12 @@ jobs: | |||
155 | run: npm run lint && npm run test | 155 | run: npm run lint && npm run test |
156 | - name: Build Ferdium without publish for any branch not 'nightly' and not 'release' | 156 | - name: Build Ferdium without publish for any branch not 'nightly' and not 'release' |
157 | if: ${{ env.GIT_BRANCH_NAME != 'nightly' && env.GIT_BRANCH_NAME != 'release' }} | 157 | if: ${{ env.GIT_BRANCH_NAME != 'nightly' && env.GIT_BRANCH_NAME != 'release' }} |
158 | run: npm run build -- --publish never | ||
159 | shell: bash | ||
160 | env: | 158 | env: |
161 | CSC_IDENTITY_AUTO_DISCOVERY: false | 159 | CSC_IDENTITY_AUTO_DISCOVERY: false |
160 | run: npm run build -- --publish never | ||
161 | shell: bash | ||
162 | - name: Build Ferdium with publish for 'nightly' branch | 162 | - name: Build Ferdium with publish for 'nightly' branch |
163 | if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} | 163 | if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} |
164 | run: npm run build -- --publish always | ||
165 | shell: bash | ||
166 | env: | 164 | env: |
167 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} | 165 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} |
168 | CSC_IDENTITY_AUTO_DISCOVERY: true | 166 | CSC_IDENTITY_AUTO_DISCOVERY: true |
@@ -170,10 +168,10 @@ jobs: | |||
170 | APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }} | 168 | APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }} |
171 | CSC_LINK: ${{ secrets.CSC_LINK }} | 169 | CSC_LINK: ${{ secrets.CSC_LINK }} |
172 | CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} | 170 | CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} |
173 | - name: Build Ferdium with publish for 'release' branch | ||
174 | if: ${{ env.GIT_BRANCH_NAME == 'release' }} | ||
175 | run: npm run build -- --publish always | 171 | run: npm run build -- --publish always |
176 | shell: bash | 172 | shell: bash |
173 | - name: Build Ferdium with publish for 'release' branch | ||
174 | if: ${{ env.GIT_BRANCH_NAME == 'release' }} | ||
177 | env: | 175 | env: |
178 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} | 176 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} |
179 | CSC_IDENTITY_AUTO_DISCOVERY: true | 177 | CSC_IDENTITY_AUTO_DISCOVERY: true |
@@ -181,6 +179,8 @@ jobs: | |||
181 | APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }} | 179 | APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }} |
182 | CSC_LINK: ${{ secrets.CSC_LINK }} | 180 | CSC_LINK: ${{ secrets.CSC_LINK }} |
183 | CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} | 181 | CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} |
182 | run: npm run build -- --publish always | ||
183 | shell: bash | ||
184 | 184 | ||
185 | build_linux: | 185 | build_linux: |
186 | name: "ubuntu ${{ github.event.inputs.message }}" | 186 | name: "ubuntu ${{ github.event.inputs.message }}" |
@@ -361,19 +361,19 @@ jobs: | |||
361 | CSC_IDENTITY_AUTO_DISCOVERY: false | 361 | CSC_IDENTITY_AUTO_DISCOVERY: false |
362 | - name: Build Ferdium with publish for 'nightly' branch | 362 | - name: Build Ferdium with publish for 'nightly' branch |
363 | if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} | 363 | if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} |
364 | run: npm run build -- --publish always | ||
365 | shell: bash | ||
366 | env: | 364 | env: |
367 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} | 365 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} |
368 | CSC_IDENTITY_AUTO_DISCOVERY: true | 366 | CSC_IDENTITY_AUTO_DISCOVERY: true |
369 | WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} | 367 | WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} |
370 | WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} | 368 | WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} |
371 | - name: Build Ferdium with publish for 'release' branch | ||
372 | if: ${{ env.GIT_BRANCH_NAME == 'release' }} | ||
373 | run: npm run build -- --publish always | 369 | run: npm run build -- --publish always |
374 | shell: bash | 370 | shell: bash |
371 | - name: Build Ferdium with publish for 'release' branch | ||
372 | if: ${{ env.GIT_BRANCH_NAME == 'release' }} | ||
375 | env: | 373 | env: |
376 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} | 374 | GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} |
377 | CSC_IDENTITY_AUTO_DISCOVERY: true | 375 | CSC_IDENTITY_AUTO_DISCOVERY: true |
378 | WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} | 376 | WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} |
379 | WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} | 377 | WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} |
378 | run: npm run build -- --publish always | ||
379 | shell: bash | ||
diff --git a/.github/workflows/tag-repos.yml b/.github/workflows/tag-repos.yml index a8459c1e6..794b031bc 100644 --- a/.github/workflows/tag-repos.yml +++ b/.github/workflows/tag-repos.yml | |||
@@ -7,29 +7,39 @@ on: | |||
7 | workflow_dispatch: | 7 | workflow_dispatch: |
8 | 8 | ||
9 | jobs: | 9 | jobs: |
10 | bump-casks: | 10 | tag-repos: |
11 | runs-on: macos-latest | 11 | runs-on: macos-latest |
12 | steps: | 12 | steps: |
13 | - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled' | 13 | - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'release' |
14 | uses: actions/checkout@v3 | 14 | uses: actions/checkout@v3 |
15 | if: ${{ contains(github.event.release.tag_name, 'nightly') }} | 15 | if: ${{ contains(github.event.release.tag_name, 'nightly') || (github.event_name == 'workflow_dispatch') }} |
16 | with: | 16 | with: |
17 | ref: nightly | 17 | ref: nightly |
18 | submodules: recursive | 18 | submodules: recursive |
19 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging | 19 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging |
20 | - name: Checkout code along with submodules for the 'release' branch if the trigger event is 'scheduled' | 20 | - name: Checkout code along with submodules for the 'release' branch if the trigger event is 'release' |
21 | uses: actions/checkout@v3 | 21 | uses: actions/checkout@v3 |
22 | if: ${{ !contains(github.event.release.tag_name, 'nightly') }} | 22 | if: ${{ !contains(github.event.release.tag_name, 'nightly') }} |
23 | with: | 23 | with: |
24 | ref: release | 24 | ref: release |
25 | submodules: recursive | 25 | submodules: recursive |
26 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging | 26 | fetch-depth: 0 # Note: Needed to be able to pull the 'develop' branch as well for merging |
27 | - name: Tag the branch | 27 | - name: Extract Git tag name from the currently checked out branch (not from the branch where this run was kicked off) |
28 | run: | | 28 | run: | |
29 | TAG_NAME=$(node -p 'require("./package.json").version') | 29 | TAG_NAME=$(node -p 'require("./package.json").version') |
30 | echo "TAG_NAME=v$TAG_NAME" >> $GITHUB_ENV | ||
31 | shell: bash | ||
32 | - name: Tag the main repo | ||
33 | run: | | ||
30 | git tag -f $TAG_NAME | 34 | git tag -f $TAG_NAME |
31 | git push origin --tags --no-verify | 35 | git push origin --tags --no-verify |
32 | # Also tag the submodule so as to help identify which changes went into which nightly release | 36 | shell: bash |
33 | # TODO: Not working due to cross-repo access issues by the github-action bot | 37 | # Also tag the submodule so as to help identify which changes went into which release |
34 | # git -C recipes tag -f $TAG_NAME | 38 | # TODO: Not working due to cross-repo access issues by the github-action bot |
35 | # git -C recipes push origin --tags --no-verify | 39 | # - name: Tag the submodule |
40 | # env: | ||
41 | # GH_TOKEN: ${{ secrets.FERDIUM_RECIPES_PUBLISH_TOKEN }} | ||
42 | # run: | | ||
43 | # git -C recipes tag -f $TAG_NAME | ||
44 | # git -C recipes push origin --tags --no-verify | ||
45 | # shell: bash | ||