Skip to content

Build SwiftWasm distribution archive for Ubuntu 22.04 #4545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 13, 2022
Merged

Build SwiftWasm distribution archive for Ubuntu 22.04 #4545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ba87c0
Attempt to build on Ubuntu 22.04
MaxDesiatov May 12, 2022
7c37037
Don't attempt to uninstall {llvm,clang}-6.0
MaxDesiatov May 12, 2022
7955065
Check if docker is running before `docker rmi`
MaxDesiatov May 12, 2022
e117c95
Add ` "ubuntu22.04_x86_64"` to `build-toolchain.yml`
MaxDesiatov May 12, 2022
829c9bb
Add support for Ubuntu 22.04 to `build-toolchain.sh`
MaxDesiatov May 12, 2022
a4220db
Handle Ubuntu 22.04 in `install-dependencies.sh`
MaxDesiatov May 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions .github/workflows/build-toolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ on:
- swiftwasm-release/5.4
- swiftwasm-release/5.5
- swiftwasm-release/5.6
- swiftwasm-release/5.7
pull_request:
branches:
- swiftwasm
- swiftwasm-release/5.3
- swiftwasm-release/5.4
- swiftwasm-release/5.5
- swiftwasm-release/5.6
- swiftwasm-release/5.7
types: [opened, synchronize, reopened, labeled]
jobs:
start-runner:
Expand Down Expand Up @@ -117,6 +119,17 @@ jobs:
"clean_build_dir": false,
"free_disk_space": true
},
{
"build_os": "ubuntu-22.04",
"agent_query": "ubuntu-22.04",
"target": "ubuntu22.04_x86_64",
"run_stdlib_test": true,
"run_full_test": false,
"run_e2e_test": true,
"build_hello_wasm": true,
"clean_build_dir": false,
"free_disk_space": true
},
{
"build_os": "macos-11",
"agent_query": "macos-11",
Expand Down Expand Up @@ -201,13 +214,16 @@ jobs:
if: ${{ matrix.free_disk_space }}
run: |
df -h
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
sudo apt-get purge libgcc-9-dev gcc-9 libstdc++-9-dev libgcc-10-dev gcc-10 libstdc++-10-dev
sudo swapoff -a
sudo rm -f /swapfile
sudo rm -rf /opt/hostedtoolcache
sudo rm -rf /usr/share/dotnet
sudo apt clean
docker rmi $(docker image ls -aq)

if docker info > /dev/null 2>&1; then
docker rmi $(docker image ls -aq)
fi
df -h

- uses: actions/checkout@v2
Expand Down Expand Up @@ -247,7 +263,7 @@ jobs:
run: |

case "${{ matrix.target }}" in
"amazonlinux2_x86_64" | "ubuntu20.04_x86_64" | "ubuntu18.04_x86_64" | "ubuntu20.04_aarch64" | "macos_x86_64" | "macos_arm64")
"amazonlinux2_x86_64" | "ubuntu22.04_x86_64" | "ubuntu20.04_x86_64" | "ubuntu18.04_x86_64" | "ubuntu20.04_aarch64" | "macos_x86_64" | "macos_arm64")
./swift/utils/webassembly/ci.sh
;;
*)
Expand Down
2 changes: 2 additions & 0 deletions utils/webassembly/build-toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ case $(uname -s) in
OS_SUFFIX=ubuntu18.04_$(uname -m)
elif [ "$(grep RELEASE /etc/lsb-release)" == "DISTRIB_RELEASE=20.04" ]; then
OS_SUFFIX=ubuntu20.04_$(uname -m)
elif [ "$(grep RELEASE /etc/lsb-release)" == "DISTRIB_RELEASE=22.04" ]; then
OS_SUFFIX=ubuntu22.04_$(uname -m)
elif [[ "$(grep PRETTY_NAME /etc/os-release)" == 'PRETTY_NAME="Amazon Linux 2"' ]]; then
OS_SUFFIX=amazonlinux2_$(uname -m)
else
Expand Down
8 changes: 8 additions & 0 deletions utils/webassembly/linux/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ else
libpython2-dev libncurses5 libncurses5-dev pkg-config \
libblocksruntime-dev libcurl4-openssl-dev \
make systemtap-sdt-dev tzdata rsync wget llvm zip unzip
elif [ $(grep RELEASE /etc/lsb-release) == "DISTRIB_RELEASE=22.04" ]; then
sudo apt install -y \
git ninja-build clang python3 python-six \
uuid-dev libicu-dev icu-devtools libbsd-dev \
libedit-dev libxml2-dev libsqlite3-dev swig \
libpython2-dev libncurses5 libncurses5-dev pkg-config \
libblocksruntime-dev libcurl4-openssl-dev \
make systemtap-sdt-dev tzdata rsync wget llvm zip unzip
else
echo "Unknown Ubuntu version"
exit 1
Expand Down