Skip to content

Commit 58b3e58

Browse files
committed
package/ci: add an ARM64 build.
Because now both Android and iOS build for x86, we wouldn't have any ARM build to test with otherwise.
1 parent 4fde9a3 commit 58b3e58

File tree

1 file changed

+32
-1
lines changed

1 file changed

+32
-1
lines changed

package/ci/circleci.yml

+32-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ executors:
3131
android-29:
3232
machine:
3333
image: android:202102-01
34+
arm64:
35+
machine:
36+
image: ubuntu-2004:202101-01
37+
resource_class: arm.medium
3438

3539
commands:
3640
install-base-linux:
@@ -46,6 +50,20 @@ commands:
4650
if [[ "$CMAKE_CXX_FLAGS" == *"--coverage"* ]]; then export LCOV_PACKAGES="lcov curl"; fi
4751
apt install -y ninja-build $LCOV_PACKAGES << parameters.extra >>
4852
53+
install-base-linux-arm64:
54+
parameters:
55+
extra:
56+
type: string
57+
default: ""
58+
steps:
59+
- run:
60+
name: Update apt and install base packages
61+
# Compared to Docker images this needs sudo
62+
command: |
63+
sudo apt update
64+
if [[ "$CMAKE_CXX_FLAGS" == *"--coverage"* ]]; then export LCOV_PACKAGES="lcov curl"; fi
65+
sudo apt install -y ninja-build gcc cmake $LCOV_PACKAGES << parameters.extra >>
66+
4967
install-base-macos:
5068
parameters:
5169
extra:
@@ -84,7 +102,7 @@ commands:
84102
background: true
85103
- run:
86104
name: Update apt and install base packages
87-
# Compared to Docker images this needs sudo, for some reason
105+
# Compared to Docker images this needs sudo
88106
command: |
89107
sudo apt update
90108
sudo apt install -y ninja-build
@@ -205,6 +223,18 @@ jobs:
205223
script: unix-desktop.sh
206224
- lcov
207225

226+
linux-arm64:
227+
executor: arm64
228+
environment:
229+
CMAKE_CXX_FLAGS: --coverage
230+
CONFIGURATION: Debug
231+
steps:
232+
- install-base-linux-arm64
233+
- make-expected-linux-dirs
234+
- build:
235+
script: unix-desktop.sh
236+
- lcov
237+
208238
linux-static:
209239
executor: ubuntu-16_04
210240
environment:
@@ -332,6 +362,7 @@ workflows:
332362
build:
333363
jobs:
334364
- linux
365+
- linux-arm64
335366
- linux-static
336367
- linux-nondeprecated
337368
- linux-sanitizers

0 commit comments

Comments
 (0)