Skip to content

Commit c9ff869

Browse files
committed
1 parent 93d2c02 commit c9ff869

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

.github/workflows/build.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,6 @@ jobs:
3232
run: |
3333
sudo apt-get install -y musl-tools musl-dev
3434
35-
# @todo ugly fix for ugly fix, musl.cc is not available from github runner
36-
- name: Download musl cross-compiler
37-
uses: Difegue/[email protected]
38-
with:
39-
args: get -m https://mega.nz/file/zQwVHSYb#8WqqMUCTbbEVKDW55NPrRnM2-4SC-numNCLDKoTWtwQ ~/
40-
41-
- name: Unpack musl cross-compiler
42-
run: |
43-
tar -xvf ~/aarch64-linux-musl-cross.tgz -C ~/
44-
4535
# - name: Cache golang
4636
# id: cache-golang
4737
# uses: actions/cache@v4

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ build/linux/amd64/$(NAME)-fips build/darwin/amd64/$(NAME)-fips:
6666
# bash -xce 'if [[ ! -f ~/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc ]]; then wget -nv -P ~ https://musl.cc/aarch64-linux-musl-cross.tgz; tar -xvf ~/aarch64-linux-musl-cross.tgz -C ~; fi' && \
6767
6868
build/linux/arm64/$(NAME)-fips build/darwin/arm64/$(NAME)-fips:
69-
bash -xce 'if [[ ! -f ~/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc ]]; then rm -rf ~/aarch64-linux-musl-cross; wget -nv /tmp/megacmd.deb https://mega.nz/linux/repo/xUbuntu_$(shell lsb_release -r -s)/amd64/megacmd-xUbuntu_$(shell lsb_release -r -s)_amd64.deb; sudo apt install -y /tmp/megacmd.deb; mega-get https://mega.nz/file/zQwVHSYb#8WqqMUCTbbEVKDW55NPrRnM2-4SC-numNCLDKoTWtwQ ~/; tar -xvf ~/aarch64-linux-musl-cross.tgz -C ~; fi' && \
69+
bash -xce 'if [[ ! -f ~/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc ]]; then rm -rf ~/aarch64-linux-musl-cross; wget -nv -O /tmp/megacmd.deb https://mega.nz/linux/repo/xUbuntu_$(shell bash -c 'cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d "=" -f 2')/amd64/megacmd-xUbuntu_$(shell bash -c 'cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d "=" -f 2')_amd64.deb; if command -v sudo >/dev/null 2>&1; then sudo apt install -y /tmp/megacmd.deb; else apt install -y /tmp/megacmd.deb; fi; mega-get https://mega.nz/file/zQwVHSYb#8WqqMUCTbbEVKDW55NPrRnM2-4SC-numNCLDKoTWtwQ ~/; tar -xvf ~/aarch64-linux-musl-cross.tgz -C ~; fi' && \
7070
CC=~/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc GOEXPERIMENT=boringcrypto CGO_ENABLED=1 GOOS=$(GOOS) GOARCH=$(GOARCH) $(GO_BUILD_STATIC_FIPS) -o $@ ./cmd/$(NAME) && \
7171
go tool nm $@ > /tmp/$(NAME)-fips-tags.txt && \
7272
grep '_Cfunc__goboringcrypto_' /tmp/$(NAME)-fips-tags.txt 1> /dev/null && \

0 commit comments

Comments
 (0)