Skip to content

Commit 168137f

Browse files
committed
removed armv7 ios
1 parent 37ff1c0 commit 168137f

File tree

6 files changed

+6
-38
lines changed

6 files changed

+6
-38
lines changed

.github/workflows/ios.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,10 @@ env:
1515
VERSION: ${{ github.event.inputs.version || (startsWith(github.ref, 'refs/tags/') && github.ref || '') }}
1616

1717
jobs:
18-
binding_arm7:
19-
runs-on: macos-14
20-
steps:
21-
- uses: actions/checkout@v3
22-
- uses: actions/setup-go@v3
23-
with:
24-
go-version: '1.14.15'
25-
- name: Build Go
26-
run: ./go.sh 1.14.15 fastrsa
27-
- name: Build
28-
run: |
29-
export PATH="/tmp/go/bin:$PATH"
30-
make binding_ios_armv7
31-
- uses: actions/upload-artifact@v3
32-
with:
33-
name: output_binding_arm7
34-
path: output
35-
retention-days: 1
36-
3718
binding:
3819
runs-on: macos-14
39-
needs: binding_arm7
4020
steps:
4121
- uses: actions/checkout@v3
42-
- uses: actions/download-artifact@v2
43-
with:
44-
name: output_binding_arm7
45-
path: output
4622
- uses: actions/setup-go@v3
4723
with:
4824
go-version: '^1.23'

.github/workflows/linux.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
runs-on: ubuntu-24.04
2020
steps:
2121
- uses: actions/checkout@v3
22-
- uses: docker-practice/actions-setup-docker@master
2322
- name: Build
2423
run: make binding_linux
2524
- name: Compress

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
go: [ '1.20', '1.14']
14+
go: [ '1.23']
1515
name: Using Go ${{ matrix.go }}
1616
steps:
1717
- uses: actions/checkout@v3

.github/workflows/wasm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
go-version: '^1.23'
2525
- name: Install TinyGo
2626
run: |
27-
wget https://github.com/tinygo-org/tinygo/releases/download/v0.28.1/tinygo_0.28.1_amd64.deb
28-
sudo dpkg -i tinygo_0.28.1_amd64.deb
27+
wget https://github.com/tinygo-org/tinygo/releases/download/v0.34.0/tinygo_0.34.0_amd64.deb
28+
sudo dpkg -i tinygo_0.34.0_amd64.deb
2929
- name: Build
3030
run: make wasm
3131
- name: Compress

.github/workflows/windows.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
runs-on: ubuntu-24.04
2020
steps:
2121
- uses: actions/checkout@v3
22-
- uses: docker-practice/actions-setup-docker@master
2322
- name: Build
2423
run: make binding_windows
2524
- name: Compress

Makefile.ios

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ IOS_BINDING_OUTPUT?=$(BINDING_OUTPUT)/$(IOS_OUTPUT)
33
IOS_BINDING_NAME?=$(BINDING_NAME).a
44

55
binding_ios: binding_ios_arm64 binding_ios_x86_64_sim
6-
lipo $(IOS_BINDING_OUTPUT)/x86_64_sim/$(IOS_BINDING_NAME) $(IOS_BINDING_OUTPUT)/arm64/$(IOS_BINDING_NAME) $(IOS_BINDING_OUTPUT)/armv7/$(IOS_BINDING_NAME) -create -output $(IOS_BINDING_OUTPUT)/$(IOS_BINDING_NAME)
6+
lipo $(IOS_BINDING_OUTPUT)/x86_64_sim/$(IOS_BINDING_NAME) $(IOS_BINDING_OUTPUT)/arm64/$(IOS_BINDING_NAME) -create -output $(IOS_BINDING_OUTPUT)/$(IOS_BINDING_NAME)
77
cp $(IOS_BINDING_OUTPUT)/arm64/*.h $(IOS_BINDING_OUTPUT)
8-
rm -rf $(IOS_BINDING_OUTPUT)/arm64 $(IOS_BINDING_OUTPUT)/x86_64_sim $(IOS_BINDING_OUTPUT)/armv7
8+
rm -rf $(IOS_BINDING_OUTPUT)/arm64 $(IOS_BINDING_OUTPUT)/x86_64_sim
99

1010
binding_ios_xcframework: binding_ios_all_iphone binding_ios_all_sim binding_ios_all_catalyst
1111
mkdir -p $(IOS_BINDING_OUTPUT)/headers
@@ -63,10 +63,4 @@ binding_ios_arm64:
6363
BINDING_FILE=$(IOS_OUTPUT)/arm64/$(IOS_BINDING_NAME) BUILD_MODE="c-archive" \
6464
SDK=iphoneos CC=$(PWD)/clangwrap.sh \
6565
GOOS=ios GOARCH=arm64 CGO_ENABLED=1 \
66-
make binding
67-
68-
binding_ios_armv7:
69-
BINDING_FILE=$(IOS_OUTPUT)/armv7/$(IOS_BINDING_NAME) BUILD_MODE="c-archive" \
70-
SDK=iphoneos CC=$(PWD)/clangwrap.sh CGO_CFLAGS="-fembed-bitcode" \
71-
GOOS=darwin GOARCH=arm CGO_ENABLED=1 BINDING_ARGS="-tags ios" \
72-
make binding
66+
make binding

0 commit comments

Comments
 (0)