Skip to content

Commit a98e0dc

Browse files
MaxDesiatovMaxDesiatov
authored
Merge pull request #4001 from swiftwasm/MaxDesiatov-patch-1
2 parents f2e72ac + c490248 commit a98e0dc

File tree

4 files changed

+93
-34
lines changed

4 files changed

+93
-34
lines changed

‎.github/workflows/build-toolchain.yml‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ on:
77
- swiftwasm-release/5.3
88
- swiftwasm-release/5.4
99
- swiftwasm-release/5.5
10+
- swiftwasm-release/5.6
1011
pull_request:
1112
branches:
1213
- swiftwasm
1314
- swiftwasm-release/5.3
1415
- swiftwasm-release/5.4
1516
- swiftwasm-release/5.5
17+
- swiftwasm-release/5.6
1618
jobs:
1719
build_toolchain:
1820
env:
@@ -21,6 +23,15 @@ jobs:
2123
strategy:
2224
matrix:
2325
include:
26+
- build_os: amazon-linux-2
27+
agent_query: [AmazonLinux2, X64]
28+
target: amazonlinux2_x86_64
29+
run_stdlib_test: false
30+
run_full_test: false
31+
run_e2e_test: false
32+
build_hello_wasm: true
33+
clean_build_dir: true
34+
2435
- build_os: ubuntu-18.04
2536
agent_query: ubuntu-18.04
2637
target: ubuntu18.04_x86_64
@@ -39,6 +50,15 @@ jobs:
3950
build_hello_wasm: true
4051
clean_build_dir: false
4152

53+
- build_os: ubuntu-20.04
54+
agent_query: [ubuntu20.04, ARM64]
55+
target: ubuntu20.04_aarch64
56+
run_stdlib_test: false
57+
run_full_test: false
58+
run_e2e_test: false
59+
build_hello_wasm: true
60+
clean_build_dir: true
61+
4262
- build_os: macos-11
4363
agent_query: macos-11
4464
target: macos_x86_64
@@ -73,7 +93,7 @@ jobs:
7393
rm -rf /usr/share/swift/
7494
7595
- name: Free disk space
76-
if: ${{ matrix.build_os == 'ubuntu-20.04' || matrix.build_os == 'ubuntu-18.04' }}
96+
if: ${{ (matrix.build_os == 'ubuntu-20.04' || matrix.build_os == 'ubuntu-18.04') && matrix.agent_query == null }}
7797
run: |
7898
df -h
7999
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
@@ -123,7 +143,7 @@ jobs:
123143
run: |
124144
125145
case "${{ matrix.target }}" in
126-
"ubuntu20.04_x86_64" | "ubuntu18.04_x86_64" | "macos_x86_64" | "macos_arm64")
146+
"amazonlinux2_x86_64" | "ubuntu20.04_x86_64" | "ubuntu18.04_x86_64" | "ubuntu20.04_aarch64" | "macos_x86_64" | "macos_arm64")
127147
./swift/utils/webassembly/ci.sh
128148
;;
129149
*)

‎utils/build-script‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ _SUPPORTED_XCODE_BUILDS = [
5959
("13.0 beta 4", "13A5201i"),
6060
("13.0", "13A233"),
6161
("13.1 RC 1", "13A1030d"),
62-
("13.2 beta", "13C5066c")
62+
("13.2 beta", "13C5066c"),
63+
("13.2.1", "13C100")
6364
]
6465

6566
# -----------------------------------------------------------------------------

‎utils/webassembly/linux/install-dependencies.sh‎

Lines changed: 67 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,86 @@
22

33
set -ex
44

5-
sudo apt update
6-
7-
if [ $(grep RELEASE /etc/lsb-release) == "DISTRIB_RELEASE=18.04" ]; then
8-
sudo apt install -y \
9-
git ninja-build clang-10 python python-six \
10-
uuid-dev libicu-dev icu-devtools libbsd-dev \
11-
libedit-dev libxml2-dev libsqlite3-dev swig \
12-
libpython-dev libncurses5 libncurses5-dev pkg-config \
13-
libblocksruntime-dev libcurl4-openssl-dev \
14-
make systemtap-sdt-dev tzdata rsync wget llvm-10 zip unzip
15-
sudo ln -s -f /usr/bin/clang-10 /usr/bin/clang
16-
sudo ln -s -f /usr/bin/clang++-10 /usr/bin/clang++
17-
elif [ $(grep RELEASE /etc/lsb-release) == "DISTRIB_RELEASE=20.04" ]; then
18-
sudo apt install -y \
19-
git ninja-build clang python python-six \
20-
uuid-dev libicu-dev icu-devtools libbsd-dev \
21-
libedit-dev libxml2-dev libsqlite3-dev swig \
22-
libpython2-dev libncurses5 libncurses5-dev pkg-config \
23-
libblocksruntime-dev libcurl4-openssl-dev \
24-
make systemtap-sdt-dev tzdata rsync wget llvm zip unzip
5+
if [[ "$(cat /etc/system-release)" == *"Amazon Linux release 2"* ]]; then
6+
sudo yum -y install \
7+
clang \
8+
curl-devel \
9+
gcc-c++ \
10+
git \
11+
glibc-static \
12+
libbsd-devel \
13+
libedit-devel \
14+
libicu-devel \
15+
libuuid-devel \
16+
libxml2-devel \
17+
ncurses-compat-libs \
18+
ncurses-devel \
19+
ninja-build \
20+
pexpect \
21+
pkgconfig \
22+
procps-ng \
23+
python \
24+
python-devel \
25+
python-pkgconfig \
26+
python-six \
27+
python3-devel \
28+
rsync \
29+
sqlite-devel \
30+
swig \
31+
tzdata \
32+
uuid-devel \
33+
wget \
34+
which
35+
36+
if [ ! -e /usr/local/bin/ninja ]; then
37+
sudo ln -s /usr/bin/ninja-build /usr/local/bin/ninja
38+
fi
2539
else
26-
echo "Unknown Ubuntu version"
27-
exit 1
40+
sudo apt update
41+
42+
if [ $(grep RELEASE /etc/lsb-release) == "DISTRIB_RELEASE=18.04" ]; then
43+
sudo apt install -y \
44+
git ninja-build clang-10 python python-six \
45+
uuid-dev libicu-dev icu-devtools libbsd-dev \
46+
libedit-dev libxml2-dev libsqlite3-dev swig \
47+
libpython-dev libncurses5 libncurses5-dev pkg-config \
48+
libblocksruntime-dev libcurl4-openssl-dev \
49+
make systemtap-sdt-dev tzdata rsync wget llvm-10 zip unzip
50+
sudo ln -s -f /usr/bin/clang-10 /usr/bin/clang
51+
sudo ln -s -f /usr/bin/clang++-10 /usr/bin/clang++
52+
elif [ $(grep RELEASE /etc/lsb-release) == "DISTRIB_RELEASE=20.04" ]; then
53+
sudo apt install -y \
54+
git ninja-build clang python python-six \
55+
uuid-dev libicu-dev icu-devtools libbsd-dev \
56+
libedit-dev libxml2-dev libsqlite3-dev swig \
57+
libpython2-dev libncurses5 libncurses5-dev pkg-config \
58+
libblocksruntime-dev libcurl4-openssl-dev \
59+
make systemtap-sdt-dev tzdata rsync wget llvm zip unzip
60+
else
61+
echo "Unknown Ubuntu version"
62+
exit 1
63+
fi
64+
sudo apt clean
2865
fi
29-
sudo apt clean
3066

3167
SOURCE_PATH="$( cd "$(dirname $0)/../../../.." && pwd )"
3268
SWIFT_PATH=$SOURCE_PATH/swift
3369
cd $SWIFT_PATH
3470

35-
./utils/update-checkout --clone --scheme wasm --skip-repository swift
71+
./utils/update-checkout --clone --scheme wasm/5.6 --skip-repository swift
3672

3773
# Install wasmer
38-
39-
if [ ! -e ~/.wasmer/bin/wasmer ]; then
40-
curl https://get.wasmer.io -sSfL | sh
74+
# FIXME: Wasmer doesn't support linux-aarch64, consider using a different WASI-compatible runtime.
75+
if [ "$(uname -m)" != "aarch64" ]; then
76+
if [ ! -e ~/.wasmer/bin/wasmer ]; then
77+
curl https://get.wasmer.io -sSfL | sh -s "2.1.1"
78+
fi
4179
fi
4280

4381
cd $SOURCE_PATH
4482

4583
if [ -z $(which cmake) ]; then
46-
wget -O install_cmake.sh "https://github.com/Kitware/CMake/releases/download/v3.17.2/cmake-3.17.2-Linux-x86_64.sh"
84+
wget -O install_cmake.sh "https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1-linux-$(uname -m).sh"
4785
chmod +x install_cmake.sh
4886
sudo mkdir -p /opt/cmake
4987
sudo ./install_cmake.sh --skip-license --prefix=/opt/cmake
@@ -56,7 +94,7 @@ cmake --version
5694

5795
if [ -z $(which sccache) ]; then
5896
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" | \
97+
wget -O - "https://github.com/mozilla/sccache/releases/download/0.2.14/sccache-0.2.14-$(uname -m)-unknown-linux-musl.tar.gz" | \
6098
sudo tar xz --strip-components 1
6199
sudo ln -sf /opt/sccache/sccache /usr/local/bin
62100
fi

‎utils/webassembly/macos/install-dependencies.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ brew install cmake ninja llvm sccache
1111

1212
# Install latest wasmer
1313
if [ ! -e ~/.wasmer/bin/wasmer ]; then
14-
curl https://get.wasmer.io -sSfL | sh
14+
curl https://get.wasmer.io -sSfL | sh -s "2.1.1"
1515
fi
1616

1717
SOURCE_PATH="$(cd "$(dirname $0)/../../../../" && pwd)"
1818
SWIFT_PATH=$SOURCE_PATH/swift
1919
cd $SWIFT_PATH
2020

21-
./utils/update-checkout --clone --scheme wasm --skip-repository swift
21+
./utils/update-checkout --clone --scheme wasm/5.6 --skip-repository swift
2222

2323
cd $SOURCE_PATH
2424

0 commit comments

Comments
 (0)