aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Alphrag <34252790+Alphrag@users.noreply.github.com>2022-12-18 16:37:22 +0100
committerLibravatar Vijay Aravamudhan <vraravam@users.noreply.github.com>2022-12-19 03:44:41 +0530
commit98e5d380e06c9d5eefb5ff8cb6555c29aa594aae (patch)
tree65a1f14d4ca905551a94bbb35109b1e723a4b345
parent6.2.3-nightly.10 [skip ci] (diff)
downloadferdium-app-98e5d380e06c9d5eefb5ff8cb6555c29aa594aae.tar.gz
ferdium-app-98e5d380e06c9d5eefb5ff8cb6555c29aa594aae.tar.zst
ferdium-app-98e5d380e06c9d5eefb5ff8cb6555c29aa594aae.zip
Update retry action on builds
-rw-r--r--.github/workflows/builds.yml23
-rw-r--r--scripts/build-windows.ps12
2 files changed, 20 insertions, 5 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 3d22066a0..8badd5e32 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -56,7 +56,12 @@ jobs:
56 run: npm i -gf "pnpm@$(node -p 'require("./package.json").engines.pnpm')" && pnpm -v 56 run: npm i -gf "pnpm@$(node -p 'require("./package.json").engines.pnpm')" && pnpm -v
57 - name: Install node dependencies 57 - name: Install node dependencies
58 if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} 58 if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
59 run: pnpm i 59 uses: nick-fields/retry@v2.8.2
60 with:
61 command: pnpm i
62 timeout_minutes: 15
63 max_attempts: 3
64 retry_on: error
60 - id: should_run 65 - id: should_run
61 name: Check whether there are any commits since this run was last triggered and push them and/or set the output 66 name: Check whether there are any commits since this run was last triggered and push them and/or set the output
62 if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }} 67 if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]')) }}
@@ -173,7 +178,12 @@ jobs:
173 - name: Install pnpm 178 - name: Install pnpm
174 run: npm i -gf "pnpm@$(node -p 'require("./package.json").engines.pnpm')" && pnpm -v 179 run: npm i -gf "pnpm@$(node -p 'require("./package.json").engines.pnpm')" && pnpm -v
175 - name: Install node dependencies 180 - name: Install node dependencies
176 run: pnpm i 181 uses: nick-fields/retry@v2.8.2
182 with:
183 command: pnpm i
184 timeout_minutes: 15
185 max_attempts: 3
186 retry_on: error
177 - name: Package recipes 187 - name: Package recipes
178 run: pnpm i && pnpm lint && pnpm reformat-files && pnpm package 188 run: pnpm i && pnpm lint && pnpm reformat-files && pnpm package
179 working-directory: ./recipes 189 working-directory: ./recipes
@@ -247,7 +257,12 @@ jobs:
247 - name: Install pnpm 257 - name: Install pnpm
248 run: npm i -gf "pnpm@$(node -p 'require("./package.json").engines.pnpm')" && pnpm -v 258 run: npm i -gf "pnpm@$(node -p 'require("./package.json").engines.pnpm')" && pnpm -v
249 - name: Install node dependencies 259 - name: Install node dependencies
250 run: pnpm i 260 uses: nick-fields/retry@v2.8.2
261 with:
262 command: pnpm i
263 timeout_minutes: 15
264 max_attempts: 3
265 retry_on: error
251 - name: Figure out used package.json version 266 - name: Figure out used package.json version
252 run: | 267 run: |
253 PACKAGE_VERSION="$(node -p 'require("./package.json").version')" 268 PACKAGE_VERSION="$(node -p 'require("./package.json").version')"
@@ -343,7 +358,7 @@ jobs:
343 - name: Install pnpm 358 - name: Install pnpm
344 run: npm i -gf "pnpm@$(node -p 'require(\"./package.json\").engines.pnpm')" && pnpm -v 359 run: npm i -gf "pnpm@$(node -p 'require(\"./package.json\").engines.pnpm')" && pnpm -v
345 - name: Install node dependencies 360 - name: Install node dependencies
346 uses: nick-invision/retry@v2.4.0 361 uses: nick-fields/retry@v2.8.2
347 with: 362 with:
348 command: pnpm i 363 command: pnpm i
349 timeout_minutes: 15 364 timeout_minutes: 15
diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1
index 3c85e0a38..5da7df540 100644
--- a/scripts/build-windows.ps1
+++ b/scripts/build-windows.ps1
@@ -141,7 +141,7 @@ $EXPECTED_RECIPES_PNPM_VERSION = (Get-Content .\recipes\package.json | ConvertFr
141if ($ACTUAL_PNPM_VERSION -ne $EXPECTED_RECIPES_PNPM_VERSION) { 141if ($ACTUAL_PNPM_VERSION -ne $EXPECTED_RECIPES_PNPM_VERSION) {
142 fail_with_docs "The expected versions of pnpm are not the same in the main repo and in the recipes submodule, please sync them. 142 fail_with_docs "The expected versions of pnpm are not the same in the main repo and in the recipes submodule, please sync them.
143 expected in recipes : [$EXPECTED_RECIPES_PNPM_VERSION] 143 expected in recipes : [$EXPECTED_RECIPES_PNPM_VERSION]
144 expected in main repo: [$EXPECTED_RECIPES_PNPM_VERSION] 144 expected in main repo: [$EXPECTED_PNPM_VERSION]
145 actual : [$EXPECTED_PNPM_VERSION]" 145 actual : [$EXPECTED_PNPM_VERSION]"
146} 146}
147 147