Skip to content

Commit 3e2f6e4

Browse files
Add Ubuntu 20.04 on ARM64 build agent (#4150)
Tests on this new platform are disabled for now due to #4152. Related to #1854. * Add Ubuntu 20.04 on ARM64 build agent * Don't attempt to install Wasmer on linux-aarch64 * Fix typo: `==` -> `!=` * Fix `sccache` installation on aarch64 * Use `aarch64` suffix in `target` property * Fix `aarch64` suffix use * Apply suggestions from code review Co-authored-by: Yuta Saito <[email protected]>
1 parent 6efc526 commit 3e2f6e4

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

.github/workflows/build-toolchain.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@ jobs:
4141
build_hello_wasm: true
4242
clean_build_dir: false
4343

44+
- build_os: ubuntu-20.04
45+
agent_query: [ubuntu20.04, ARM64]
46+
target: ubuntu20.04_aarch64
47+
run_stdlib_test: false
48+
run_full_test: false
49+
run_e2e_test: false
50+
build_hello_wasm: true
51+
clean_build_dir: true
52+
4453
- build_os: macos-11
4554
agent_query: macos-11
4655
target: macos_x86_64
@@ -75,7 +84,7 @@ jobs:
7584
rm -rf /usr/share/swift/
7685
7786
- name: Free disk space
78-
if: ${{ matrix.build_os == 'ubuntu-20.04' || matrix.build_os == 'ubuntu-18.04' }}
87+
if: ${{ (matrix.build_os == 'ubuntu-20.04' || matrix.build_os == 'ubuntu-18.04') && matrix.agent_query == null }}
7988
run: |
8089
df -h
8190
sudo apt-get purge libgcc-9-dev gcc-9 libstdc++-9-dev libgcc-10-dev gcc-10 libstdc++-10-dev clang-6.0 llvm-6.0
@@ -125,7 +134,7 @@ jobs:
125134
run: |
126135
127136
case "${{ matrix.target }}" in
128-
"ubuntu20.04_x86_64" | "ubuntu18.04_x86_64" | "macos_x86_64" | "macos_arm64")
137+
"ubuntu20.04_x86_64" | "ubuntu18.04_x86_64" | "ubuntu20.04_aarch64" | "macos_x86_64" | "macos_arm64")
129138
./swift/utils/webassembly/ci.sh
130139
;;
131140
*)

utils/webassembly/linux/install-dependencies.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@ cd $SWIFT_PATH
3535
./utils/update-checkout --clone --scheme wasm --skip-repository swift
3636

3737
# Install wasmer
38-
39-
if [ ! -e ~/.wasmer/bin/wasmer ]; then
40-
curl https://get.wasmer.io -sSfL | sh
38+
# FIXME: Wasmer doesn't support linux-aarch64, consider using a different WASI-compatible runtime.
39+
if [ "$(uname -m)" != "aarch64" ]; then
40+
if [ ! -e ~/.wasmer/bin/wasmer ]; then
41+
curl https://get.wasmer.io -sSfL | sh
42+
fi
4143
fi
4244

4345
cd $SOURCE_PATH
@@ -56,7 +58,7 @@ cmake --version
5658

5759
if [ -z $(which sccache) ]; then
5860
sudo mkdir /opt/sccache && cd /opt/sccache
59-
wget -O - "https://github.com/mozilla/sccache/releases/download/0.2.13/sccache-0.2.13-x86_64-unknown-linux-musl.tar.gz" | \
61+
wget -O - "https://github.com/mozilla/sccache/releases/download/0.2.14/sccache-0.2.14-$(uname -m)-unknown-linux-musl.tar.gz" | \
6062
sudo tar xz --strip-components 1
6163
sudo ln -sf /opt/sccache/sccache /usr/local/bin
6264
fi

0 commit comments

Comments
 (0)