Skip to content

Commit 309f44e

Browse files
committed
fix(workflow): update linux-musl job configurations for arm64 and x86_64
1 parent aa54c07 commit 309f44e

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ jobs:
3131
- os: ubuntu-24.04-arm
3232
arch: arm64
3333
name: linux-musl
34-
container: alpine:latest
3534
- os: macos-latest
3635
name: macos
3736
- os: windows-latest
@@ -61,7 +60,7 @@ jobs:
6160

6261
defaults:
6362
run:
64-
shell: ${{ matrix.name == 'linux-musl' && 'sh' || 'bash' }}
63+
shell: ${{ matrix.name == 'linux-musl' && matrix.arch == 'x86_64' && 'sh' || 'bash' }}
6564

6665
env:
6766
CONNECTION_STRING: ${{ secrets.CONNECTION_STRING }}
@@ -71,24 +70,20 @@ jobs:
7170
steps:
7271

7372
- uses: actions/[email protected]
74-
if: matrix.name != 'linux-musl' || matrix.arch != 'arm64'
7573

7674
- uses: msys2/[email protected]
7775
if: matrix.os == 'windows-latest'
7876
with:
7977
msystem: mingw64
8078
install: mingw-w64-x86_64-cc make
8179

82-
- name: linux-musl install dependencies
83-
if: matrix.name == 'linux-musl'
84-
run: apk update && apk add --no-cache git gcc make curl sqlite openssl-dev musl-dev linux-headers
85-
86-
- name: linux-musl arm64 checkout
80+
- name: linux-musl x86_64 install dependencies
81+
if: matrix.name == 'linux-musl' && matrix.arch == 'x86_64'
82+
run: apk update && apk add --no-cache gcc make curl sqlite openssl-dev musl-dev linux-headers
83+
84+
- name: linux-musl arm64 install dependencies
8785
if: matrix.name == 'linux-musl' && matrix.arch == 'arm64'
88-
run: |
89-
git config --global --add safe.directory '*'
90-
git clone https://github.com/${{ github.repository }}.git .
91-
git checkout ${{ github.sha }}
86+
run: sudo apt-get update && sudo apt-get install -y gcc make curl sqlite3 libssl-dev musl-dev musl-tools linux-headers-generic
9287

9388
- name: windows build curl
9489
if: matrix.os == 'windows-latest'

0 commit comments

Comments
 (0)