Skip to content

Commit 644e2dd

Browse files
committed
workflow: fix continue_on_error
1 parent fb13fa4 commit 644e2dd

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

.github/workflows/build_pre_release.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
client-build:
9191
needs: [draft]
9292
runs-on: ${{ matrix.runs_on }}
93-
continue-on-error: ${{ matrix.continue-on-error || false }}
93+
continue-on-error: ${{ matrix.continue_on_error || false }}
9494
strategy:
9595
fail-fast: false
9696
matrix:
@@ -101,7 +101,7 @@ jobs:
101101
arch: amd64
102102
- runs_on: ubuntu-24.04-arm
103103
arch: arm32
104-
continue-on-error: true
104+
continue_on_error: true
105105
env:
106106
ARCH: ${{ matrix.arch }}
107107
steps:
@@ -115,7 +115,6 @@ jobs:
115115

116116
# Compile the client
117117
- name: Run client for ${{matrix.arch}}
118-
continue-on-error: ${{ matrix.continue_on_error || false }}
119118
run: ./release.bash "${{ env.REGISTRY }}:${{ env.TAG }}" client-tgz
120119

121120
# Upload files to draft release

.github/workflows/build_test.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
client-build:
6161
runs-on: ${{ matrix.runs_on }}
62-
continue-on-error: ${{ matrix.continue-on-error || false }}
62+
continue-on-error: ${{ matrix.continue_on_error || false }}
6363
strategy:
6464
fail-fast: false
6565
matrix:
@@ -70,7 +70,7 @@ jobs:
7070
arch: amd64
7171
- runs_on: ubuntu-24.04-arm
7272
arch: arm32
73-
continue-on-error: true
73+
continue_on_error: true
7474
env:
7575
ARCH: ${{ matrix.arch }}
7676
steps:
@@ -90,7 +90,6 @@ jobs:
9090

9191
# Compile the client
9292
- name: Run client for ${{matrix.arch}}
93-
continue-on-error: ${{ matrix.continue-on-error || false }}
9493
run: ./release.bash "${{ env.REGISTRY }}:${{ env.TAG }}" client-tgz
9594

9695
# Push Artifacts to GitHub

scripts/build/strip-cargo.bash

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ set -eo pipefail
55
for package; do
66
[[ ! -d "$package" ]] && continue
77

8-
while read cargo_config; do
9-
echo -n "" > "$cargo_config"
10-
git -C "$package" add "$(realpath "$cargo_config")" || true
11-
done < <(find "$package" -wholename '*/.cargo/config')
12-
13-
while read cargo_config; do
14-
cat <<"EOF" > "$cargo_config"
15-
[target.armv7-unknown-linux-gnueabihf]
16-
linker = "/usr/bin/arm-linux-gnueabihf-gcc"
17-
EOF
18-
git -C "$package" add "$(realpath "$cargo_config")" || true
19-
done < <(find "$package" -wholename '*/.cargo/config.toml')
8+
# while read cargo_config; do
9+
# echo -n "" > "$cargo_config"
10+
# git -C "$package" add "$(realpath "$cargo_config")" || true
11+
# done < <(find "$package" -wholename '*/.cargo/config')
12+
13+
# while read cargo_config; do
14+
# cat <<"EOF" > "$cargo_config"
15+
# [target.armv7-unknown-linux-gnueabihf]
16+
# linker = "/usr/bin/arm-linux-gnueabihf-gcc"
17+
# EOF
18+
# git -C "$package" add "$(realpath "$cargo_config")" || true
19+
# done < <(find "$package" -wholename '*/.cargo/config.toml')
2020

2121
while read debian_control; do
2222
echo "Stripping '$debian_control'..."

0 commit comments

Comments
 (0)