Skip to content

Commit decf972

Browse files
authored
Merge pull request #22 from arturo-lang/pull-FreeBSD-packages-from-latest-repo
Make sure we are covered for mirror sync issues
2 parents 54a3c62 + dfcdfa7 commit decf972

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

.github/workflows/matrix.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
include:
3030
- {os: linux, arch: amd64, do: compile}
3131
- {os: linux, arch: amd64, support: legacy, do: compile}
32-
- {os: linux, arch: amd64, mode: safe, do: compile}
3332
- {os: linux, arch: amd64, mode: mini, do: compile}
3433
- {os: linux, arch: arm64, do: compile}
3534
- {os: linux, arch: arm64, support: legacy, do: compile}

action.yml

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,14 +238,32 @@ runs:
238238
- name: Install dependencies (Linux)
239239
if: (env.os == 'linux' || env.os == 'web') && inputs.artifacts_only != 'true'
240240
run: |
241-
sudo apt-get update
242-
241+
# Multiple update attempts to handle mirror sync issues
242+
for i in 1 2 3; do
243+
sudo apt-get update && break
244+
echo "Update attempt $i failed, retrying..."
245+
sleep 5
246+
done
247+
243248
if [ "${{ env.mode }}" != "mini" ]; then
244-
sudo apt-get install libgtk-3-dev libmpfr-dev
249+
sudo apt-get install -y libgtk-3-dev libmpfr-dev
250+
245251
if [ "${{ env.support }}" = "legacy" ]; then
246-
sudo apt-get install -y libwebkit2gtk-4.0-dev
252+
for i in 1 2 3; do
253+
sudo apt-get install -y --allow-downgrades libwebkit2gtk-4.0-dev && break || \
254+
sudo apt-get install -y libwebkit2gtk-4.0-dev && break
255+
echo "Webkit install attempt $i failed, retrying..."
256+
sudo apt-get update
257+
sleep 10
258+
done
247259
else
248-
sudo apt-get install -y libwebkit2gtk-4.1-dev
260+
for i in 1 2 3; do
261+
sudo apt-get install -y --allow-downgrades libwebkit2gtk-4.1-dev && break || \
262+
sudo apt-get install -y libwebkit2gtk-4.1-dev && break
263+
echo "Webkit install attempt $i failed, retrying..."
264+
sudo apt-get update
265+
sleep 10
266+
done
249267
fi
250268
fi
251269
@@ -262,7 +280,8 @@ runs:
262280
sync: rsync
263281
copyback: true
264282
prepare: |
265-
pkg update
283+
pkg update -f
284+
266285
pkg install -y wget curl bash ca_root_nss jq
267286
if [ "${{ env.mode }}" = "full" ]; then
268287
pkg install -y gtk3 mpfr webkit2-gtk_41
@@ -327,7 +346,7 @@ runs:
327346
unzip
328347
mingw-w64-x86_64-toolchain
329348
${{ inputs.do == 'compile' && env.mode == 'full' && 'mingw-w64-x86_64-mpfr' || '' }}
330-
349+
331350
######################################
332351
######################################
333352
## > FETCH (non-artifacts-only mode)

0 commit comments

Comments
 (0)