Skip to content

Commit 3e9fd61

Browse files
committed
Fix Linux builds
1 parent 802d2eb commit 3e9fd61

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

.github/workflows/linux.yml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Get KincTools_linux_x64
4141
run: git clone https://github.com/Kode/KincTools_linux_x64.git
4242
- name: Copy binary
43-
run: cp /home/runner/work/krafix/krafix/build/Release/krafix KincTools_linux_x64/krafix
43+
run: cp /home/runner/work/krafix/krafix/build/release/krafix KincTools_linux_x64/krafix
4444
- name: Set name
4545
run: git config --global user.name "Robbot"
4646
- name: Set email
@@ -87,12 +87,15 @@ jobs:
8787
git
8888
ninja
8989
90+
- name: Download and extract musl
91+
working-directory: /home/runner/work
92+
run: |
93+
wget http://kode.tech/aarch64-linux-musl-cross.tgz
94+
tar --extract --preserve-permissions --file aarch64-linux-musl-cross.tgz
95+
9096
- name: Build in Alpine chroot
9197
run: |
92-
cd /home/runner/work
93-
mkdir aarch64
94-
wget -qO - https://more.musl.cc/11.2.1/x86_64-linux-musl/aarch64-linux-musl-cross.tgz | gunzip | tar xfp - -C ./aarch64
95-
export PATH=$PATH:/home/runner/work/aarch64/aarch64-linux-musl-cross/bin:/home/runner/work/aarch64/aarch64-linux-musl-cross/include:/home/runner/work/aarch64/aarch64-linux-musl-cross/lib
98+
export PATH=$PATH:/home/runner/work/aarch64-linux-musl-cross/bin
9699
cd /home/runner/work/krafix/krafix
97100
git clone --depth 1 https://github.com/Kode/KincTools_linux_x64.git KincTools
98101
./KincTools/kmake --compile --cc aarch64-linux-musl-gcc --cxx aarch64-linux-musl-g++
@@ -101,7 +104,7 @@ jobs:
101104
- name: Get KincTools_linux_arm64
102105
run: git clone https://github.com/Kode/KincTools_linux_arm64.git
103106
- name: Copy binary
104-
run: cp /home/runner/work/krafix/krafix/build/Release/krafix KincTools_linux_arm64/krafix
107+
run: cp /home/runner/work/krafix/krafix/build/release/krafix KincTools_linux_arm64/krafix
105108
- name: Set name
106109
run: git config --global user.name "Robbot"
107110
- name: Set email
@@ -149,12 +152,15 @@ jobs:
149152
git
150153
ninja
151154
155+
- name: Download and extract musl
156+
working-directory: /home/runner/work
157+
run: |
158+
wget http://kode.tech/armv7l-linux-musleabihf-cross.tgz
159+
tar --extract --preserve-permissions --file armv7l-linux-musleabihf-cross.tgz
160+
152161
- name: Build in Alpine chroot
153162
run: |
154-
cd /home/runner/work
155-
mkdir armv7l
156-
wget -qO - https://musl.cc/armv7l-linux-musleabihf-cross.tgz | gunzip | tar xfp - -C ./armv7l
157-
export PATH=$PATH:/home/runner/work/armv7l/armv7l-linux-musleabihf-cross/bin:/home/runner/work/armv7l/armv7l-linux-musleabihf-cross/include:/home/runner/work/armv7l/armv7l-linux-musleabihf-cross/lib
163+
export PATH=$PATH:/home/runner/work/armv7l-linux-musleabihf-cross/bin
158164
cd /home/runner/work/krafix/krafix
159165
git clone --depth 1 https://github.com/Kode/KincTools_linux_x64.git KincTools
160166
./KincTools/kmake --compile --cc armv7l-linux-musleabihf-gcc --cxx armv7l-linux-musleabihf-g++
@@ -164,7 +170,7 @@ jobs:
164170
- name: Get KincTools_linux_arm
165171
run: git clone https://github.com/Kode/KincTools_linux_arm.git
166172
- name: Copy binary
167-
run: cp /home/runner/work/krafix/krafix/build/Release/krafix KincTools_linux_arm/krafix
173+
run: cp /home/runner/work/krafix/krafix/build/release/krafix KincTools_linux_arm/krafix
168174
- name: Set name
169175
run: git config --global user.name "Robbot"
170176
- name: Set email

0 commit comments

Comments
 (0)