From 309a4e52c6bd0b0d521a461efacac84e00b51246 Mon Sep 17 00:00:00 2001 From: Gerson Alexander Pardo Gamez Date: Sun, 6 Mar 2022 20:37:29 -0500 Subject: [PATCH] updated github action --- .github/workflows/ios.yml | 9 ++++----- Makefile.ios | 9 +++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 9fa7047..50a5fee 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -16,18 +16,17 @@ env: jobs: binding_arm7: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: go-version: '1.14.15' - - name: Build - run: make binding_ios_armv7 - run: brew install binutils - - run: | + - name: Build + run: | export PATH="$PATH:/usr/local/opt/binutils/bin" - make binding_ios_armv7_prefix + make binding_ios_armv7 - uses: actions/upload-artifact@v2 with: name: output_binding_arm7 diff --git a/Makefile.ios b/Makefile.ios index 52243e9..fa834c3 100644 --- a/Makefile.ios +++ b/Makefile.ios @@ -27,9 +27,6 @@ binding_ios_armv7: SDK=iphoneos CC=$(PWD)/clangwrap.sh CGO_CFLAGS="-fembed-bitcode" \ GOOS=darwin GOARCH=arm CGO_ENABLED=1 BINDING_ARGS="-tags ios" \ make binding - -binding_ios_armv7_prefix: - objcopy --redefine-syms=ios_syms.txt $(IOS_BINDING_OUTPUT)/armv7.a || echo true - nm $(IOS_BINDING_OUTPUT)/armv7.a | grep OpenPGPBridgeCall || echo true - ld -r output/binding/ios/armv7.a -o output/binding/ios/armv77.a -alias __cgo_panic __cgo_panic_openpgp -unexported_symbol __cgo_panic || echo true - nm $(IOS_BINDING_OUTPUT)/armv7.a | grep OpenPGPBridgeCall || echo true \ No newline at end of file + #objcopy --redefine-syms=ios_syms.txt $(IOS_BINDING_OUTPUT)/armv7.a + #nm $(IOS_BINDING_OUTPUT)/armv7.a | grep OpenPGPBridgeCall + #ld -r output/binding/ios/armv7.a -o output/binding/ios/armv77.a -alias __cgo_panic __cgo_panic_openpgp -unexported_symbol __cgo_panic || echo true