Skip to content

Commit d1bb3e6

Browse files
committed
Test GNUStep libobjc2 v2.0 as well
1 parent f101615 commit d1bb3e6

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
os: macos-11
5454
target: x86_64-apple-darwin
5555
# Oldest macOS version we support
56-
sdk: 10.7
56+
sdk: "10.7"
5757
- name: Test macOS nightly w. ui tests
5858
os: macos-latest
5959
target: x86_64-apple-darwin
@@ -73,17 +73,24 @@ jobs:
7373
# binary, only build it
7474
test-args: --no-run
7575
# Newest SDK that supports 32-bit
76-
sdk: 10.13
77-
- name: Test GNUStep
76+
sdk: "10.13"
77+
- name: Test GNUStep with libobjc2 v1.9
7878
os: ubuntu-latest
7979
target: x86_64-unknown-linux-gnu
8080
runtime: gnustep-1-9
81+
libobjc2: "1.9"
82+
- name: Test GNUStep with libobjc2 v2.0
83+
os: ubuntu-latest
84+
target: x86_64-unknown-linux-gnu
85+
runtime: gnustep-2-0
86+
libobjc2: "2.0"
8187
- name: Test GNUStep 32bit
8288
os: ubuntu-latest
8389
target: i686-unknown-linux-gnu
8490
cflags: -m32
8591
configureflags: --target=x86-pc-linux-gnu
8692
runtime: gnustep-1-9
93+
libobjc2: "1.9"
8794
- name: Test iOS simulator x86 64bit
8895
os: macos-11
8996
target: x86_64-apple-ios
@@ -234,13 +241,13 @@ jobs:
234241
if: contains(matrix.runtime, 'gnustep') && steps.extern-cache.outputs.cache-hit != 'true'
235242
run: sudo apt-get -y install make cmake
236243

237-
- name: Install GNUStep libobjc2 v1.9
238-
if: contains(matrix.runtime, 'gnustep') && steps.extern-cache.outputs.cache-hit != 'true'
244+
- name: Install GNUStep libobjc2
245+
if: matrix.libobjc2 && steps.extern-cache.outputs.cache-hit != 'true'
239246
run: |
240-
wget https://github.com/gnustep/libobjc2/archive/refs/tags/v1.9.tar.gz
241-
tar -xzf v1.9.tar.gz
242-
mkdir -p libobjc2-1.9/build
243-
cd libobjc2-1.9/build
247+
wget https://github.com/gnustep/libobjc2/archive/refs/tags/v${{ matrix.libobjc2 }}.tar.gz
248+
tar -xzf v${{ matrix.libobjc2 }}.tar.gz
249+
mkdir -p libobjc2-${{ matrix.libobjc2 }}/build
250+
cd libobjc2-${{ matrix.libobjc2 }}/build
244251
cmake -Wno-dev -DCMAKE_INSTALL_PREFIX=$HOME/extern -DTESTS=OFF ..
245252
make install
246253

0 commit comments

Comments
 (0)