Skip to content

Commit 74d06be

Browse files
committed
Fix openwrt builds
1 parent 519e310 commit 74d06be

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,19 @@ jobs:
6969
strategy:
7070
matrix:
7171
include:
72-
- { os: linux, arch: amd64, variant: purego, naive: true, openwrt: "x86_64" }
72+
- { os: linux, arch: amd64, variant: purego, naive: true }
7373
- { os: linux, arch: amd64, variant: glibc, naive: true }
7474
- { os: linux, arch: amd64, variant: musl, naive: true, debian: amd64, rpm: x86_64, pacman: x86_64, openwrt: "x86_64" }
7575

76-
- { os: linux, arch: arm64, variant: purego, naive: true, openwrt: "aarch64_cortex-a53 aarch64_cortex-a72 aarch64_cortex-a76 aarch64_generic" }
76+
- { os: linux, arch: arm64, variant: purego, naive: true }
7777
- { os: linux, arch: arm64, variant: glibc, naive: true }
7878
- { os: linux, arch: arm64, variant: musl, naive: true, debian: arm64, rpm: aarch64, pacman: aarch64, openwrt: "aarch64_cortex-a53 aarch64_cortex-a72 aarch64_cortex-a76 aarch64_generic" }
7979

80-
- { os: linux, arch: "386", go386: sse2, openwrt: "i386_pentium4" }
80+
- { os: linux, arch: "386", go386: sse2 }
8181
- { os: linux, arch: "386", variant: glibc, naive: true, go386: sse2 }
8282
- { os: linux, arch: "386", variant: musl, naive: true, go386: sse2, debian: i386, rpm: i386, openwrt: "i386_pentium4" }
8383

84-
- { os: linux, arch: arm, goarm: "7", openwrt: "arm_cortex-a5_vfpv4 arm_cortex-a7_neon-vfpv4 arm_cortex-a7_vfpv4 arm_cortex-a8_vfpv3 arm_cortex-a9_neon arm_cortex-a9_vfpv3-d16 arm_cortex-a15_neon-vfpv4" }
84+
- { os: linux, arch: arm, goarm: "7" }
8585
- { os: linux, arch: arm, variant: glibc, naive: true, goarm: "7" }
8686
- { os: linux, arch: arm, variant: musl, naive: true, goarm: "7", debian: armhf, rpm: armv7hl, pacman: armv7hl, openwrt: "arm_cortex-a5_vfpv4 arm_cortex-a7_neon-vfpv4 arm_cortex-a7_vfpv4 arm_cortex-a8_vfpv3 arm_cortex-a9_neon arm_cortex-a9_vfpv3-d16 arm_cortex-a15_neon-vfpv4" }
8787

@@ -369,12 +369,8 @@ jobs:
369369
-p "dist/openwrt.deb" \
370370
--architecture all \
371371
dist/sing-box=/usr/bin/sing-box
372-
SUFFIX=""
373-
if [[ "${{ matrix.variant }}" == "musl" ]]; then
374-
SUFFIX="_musl"
375-
fi
376372
for architecture in ${{ matrix.openwrt }}; do
377-
.github/deb2ipk.sh "$architecture" "dist/openwrt.deb" "dist/sing-box_${{ needs.calculate_version.outputs.version }}_openwrt_${architecture}${SUFFIX}.ipk"
373+
.github/deb2ipk.sh "$architecture" "dist/openwrt.deb" "dist/sing-box_${{ needs.calculate_version.outputs.version }}_openwrt_${architecture}.ipk"
378374
done
379375
rm "dist/openwrt.deb"
380376
- name: Archive

0 commit comments

Comments
 (0)