Skip to content

Commit 3def023

Browse files
committed
updated ci
1 parent 49c0359 commit 3def023

File tree

2 files changed

+19
-24
lines changed

2 files changed

+19
-24
lines changed

.github/workflows/publish.yml

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ jobs:
1212
runs-on: ${{ matrix.os }}
1313
strategy:
1414
matrix:
15-
os: [ubuntu-20.04, windows-latest, macos-latest]
15+
include:
16+
- os: ubuntu-20.04
17+
- os: windows-latest
18+
- os: macos-latest
19+
arch: amd64
20+
- os: macos-latest
21+
arch: arm64
1622

1723
steps:
1824
- uses: actions/checkout@v4
@@ -23,7 +29,7 @@ jobs:
2329

2430
- name: Install dependencies on Linux
2531
if: matrix.os == 'ubuntu-20.04'
26-
run: sudo apt-get install -y sqlite3 gcc unzip gcc-aarch64-linux-gnu
32+
run: sudo apt-get install -y sqlite3 gcc unzip
2733

2834
- name: Install dependencies on Windows
2935
if: matrix.os == 'windows-latest'
@@ -48,37 +54,26 @@ jobs:
4854
- name: Build for Linux
4955
if: matrix.os == 'ubuntu-20.04'
5056
run: |
51-
make compile-linux-x86
52-
make compile-linux-arm64
57+
make compile-linux
5358
make pack-linux version=${{ env.VERSION }}
5459
55-
- name: Install MSYS2 and 'mingw-w64-i686-toolchain'
56-
if: matrix.os == 'windows-latest'
57-
uses: msys2/setup-msys2@v2
58-
with:
59-
update: true
60-
install: mingw-w64-i686-toolchain
61-
msystem: MINGW32
62-
6360
- name: Build for Windows
6461
if: matrix.os == 'windows-latest'
65-
shell: msys2 {0}
62+
shell: pwsh
6663
run: |
67-
make compile-windows-x86
6864
make compile-windows
6965
make pack-windows version=${{ env.VERSION }}
7066
7167
- name: Build for macOS
7268
if: matrix.os == 'macos-latest'
7369
run: |
74-
make compile-macos-x86
75-
make compile-macos-arm64
76-
make pack-macos version=${{ env.VERSION }}
70+
make compile-macos-universal
71+
make pack-macos-universal version=${{ env.VERSION }}
7772
7873
- name: Upload binaries to release
79-
uses: svenstaro/upload-release-action@v2
74+
uses: svenstaro/upload-release-action@2.9.0
8075
with:
8176
repo_token: ${{ secrets.GITHUB_TOKEN }}
8277
file: dist/*.zip
8378
file_glob: true
84-
tag: ${{ github.ref_name }}
79+
tag: ${{ github.ref_name }}

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,18 @@ compile-macos-universal: compile-macos-x86 compile-macos-arm64
4444
lipo -create -output dist/json_equal.dylib dist/json_equal_x86.dylib dist/json_equal_arm64.dylib
4545
lipo -create -output dist/regexp.dylib dist/regexp_x86.dylib dist/regexp_arm64.dylib
4646
lipo -create -output dist/split_part.dylib dist/split_part_x86.dylib dist/split_part_arm64.dylib
47+
rm -f dist/json_equal_x86.dylib dist/json_equal_arm64.dylib
48+
rm -f dist/regexp_x86.dylib dist/regexp_arm64.dylib
49+
rm -f dist/split_part_x86.dylib dist/split_part_arm64.dylib
4750

4851
pack-linux:
4952
zip -j dist/stackql-sqlite-ext-functions-$(version)-linux-amd64.zip dist/*.so
5053

5154
pack-windows:
5255
zip -j dist/stackql-sqlite-ext-functions-$(version)-windows-amd64.zip dist/*.dll
5356

54-
pack-macos-x86:
55-
zip -j dist/stackql-sqlite-ext-functions-$(version)-macos-x86.zip dist/*x86.dylib
56-
57-
pack-macos-arm64:
58-
zip -j dist/stackql-sqlite-ext-functions-$(version)-macos-arm64.zip dist/*arm64.dylib
57+
pack-macos-universal:
58+
zip -j dist/stackql-sqlite-ext-functions-$(version)-macos-universal.zip dist/*.dylib
5959

6060
test-all:
6161
@echo "Running tests on all suites"

0 commit comments

Comments
 (0)