Skip to content

Commit ef1ddd4

Browse files
authored
5.7: Build SwiftWasm distribution archive for Ubuntu 22.04 (#4550)
🍒 #4545 for 5.7 branch. * Attempt to build on Ubuntu 22.04 * Don't attempt to uninstall {llvm,clang}-6.0 * Check if docker is running before `docker rmi` * Add ` "ubuntu22.04_x86_64"` to `build-toolchain.yml` * Add support for Ubuntu 22.04 to `build-toolchain.sh` * Handle Ubuntu 22.04 in `install-dependencies.sh`
1 parent df03e94 commit ef1ddd4

File tree

3 files changed

+27
-3
lines changed

3 files changed

+27
-3
lines changed

.github/workflows/build-toolchain.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,17 @@ jobs:
119119
"clean_build_dir": false,
120120
"free_disk_space": true
121121
},
122+
{
123+
"build_os": "ubuntu-22.04",
124+
"agent_query": "ubuntu-22.04",
125+
"target": "ubuntu22.04_x86_64",
126+
"run_stdlib_test": true,
127+
"run_full_test": false,
128+
"run_e2e_test": true,
129+
"build_hello_wasm": true,
130+
"clean_build_dir": false,
131+
"free_disk_space": true
132+
},
122133
{
123134
"build_os": "macos-11",
124135
"agent_query": "macos-11",
@@ -203,13 +214,16 @@ jobs:
203214
if: ${{ (matrix.build_os == 'ubuntu-20.04' || matrix.build_os == 'ubuntu-18.04') && matrix.agent_query == null }}
204215
run: |
205216
df -h
206-
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
217+
sudo apt-get purge libgcc-9-dev gcc-9 libstdc++-9-dev libgcc-10-dev gcc-10 libstdc++-10-dev
207218
sudo swapoff -a
208219
sudo rm -f /swapfile
209220
sudo rm -rf /opt/hostedtoolcache
210221
sudo rm -rf /usr/share/dotnet
211222
sudo apt clean
212-
docker rmi $(docker image ls -aq)
223+
224+
if docker info > /dev/null 2>&1; then
225+
docker rmi $(docker image ls -aq)
226+
fi
213227
df -h
214228
215229
- uses: actions/checkout@v2
@@ -249,7 +263,7 @@ jobs:
249263
run: |
250264
251265
case "${{ matrix.target }}" in
252-
"amazonlinux2_x86_64" | "ubuntu20.04_x86_64" | "ubuntu18.04_x86_64" | "ubuntu20.04_aarch64" | "macos_x86_64" | "macos_arm64")
266+
"amazonlinux2_x86_64" | "ubuntu22.04_x86_64" | "ubuntu20.04_x86_64" | "ubuntu18.04_x86_64" | "ubuntu20.04_aarch64" | "macos_x86_64" | "macos_arm64")
253267
./swift/utils/webassembly/ci.sh
254268
;;
255269
*)

utils/webassembly/build-toolchain.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ case $(uname -s) in
1818
OS_SUFFIX=ubuntu18.04_$(uname -m)
1919
elif [ "$(grep RELEASE /etc/lsb-release)" == "DISTRIB_RELEASE=20.04" ]; then
2020
OS_SUFFIX=ubuntu20.04_$(uname -m)
21+
elif [ "$(grep RELEASE /etc/lsb-release)" == "DISTRIB_RELEASE=22.04" ]; then
22+
OS_SUFFIX=ubuntu22.04_$(uname -m)
2123
elif [[ "$(grep PRETTY_NAME /etc/os-release)" == 'PRETTY_NAME="Amazon Linux 2"' ]]; then
2224
OS_SUFFIX=amazonlinux2_$(uname -m)
2325
else

utils/webassembly/linux/install-dependencies.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ else
5757
libpython2-dev libncurses5 libncurses5-dev pkg-config \
5858
libblocksruntime-dev libcurl4-openssl-dev \
5959
make systemtap-sdt-dev tzdata rsync wget llvm zip unzip
60+
elif [ $(grep RELEASE /etc/lsb-release) == "DISTRIB_RELEASE=22.04" ]; then
61+
sudo apt install -y \
62+
git ninja-build clang python3 python-six \
63+
uuid-dev libicu-dev icu-devtools libbsd-dev \
64+
libedit-dev libxml2-dev libsqlite3-dev swig \
65+
libpython2-dev libncurses5 libncurses5-dev pkg-config \
66+
libblocksruntime-dev libcurl4-openssl-dev \
67+
make systemtap-sdt-dev tzdata rsync wget llvm zip unzip
6068
else
6169
echo "Unknown Ubuntu version"
6270
exit 1

0 commit comments

Comments
 (0)