Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions .github/workflows/smack-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]

jobs:
check-regressions:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
regtest_env:
Expand Down Expand Up @@ -36,7 +36,8 @@ jobs:
"--exhaustive --folder=rust/structures --languages=rust",
"--exhaustive --folder=rust/targeted-checks",
"--exhaustive --folder=rust/vector --languages=rust",
"--exhaustive --folder=rust/cargo/** --languages=cargo --threads=1",
# TODO: Cargo tests are currently disabled because of Rust version being too low
# "--exhaustive --folder=rust/cargo/** --languages=cargo --threads=1",
"--exhaustive --folder=llvm --languages=llvm-ir"
]
steps:
Expand All @@ -58,7 +59,7 @@ jobs:
run: ./bin/build.sh

build-and-push-docker:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: check-regressions

steps:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04
MAINTAINER Shaobo He <polarishehn@gmail.com>

ENV SMACKDIR /home/user/smack
Expand Down
27 changes: 21 additions & 6 deletions bin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ linux-opensuse*)
DEPENDENCIES+=" ncurses-devel"
;;

linux-@(ubuntu|neon)-@(16|18|20)*)
linux-@(ubuntu|neon)-@(16|18|20|22)*)
if [ ${INSTALL_LLVM} -eq 1 ] ; then
DEPENDENCIES+=" clang-${LLVM_SHORT_VERSION} llvm-${LLVM_SHORT_VERSION}-dev"
fi
Expand Down Expand Up @@ -248,7 +248,7 @@ if [ ${INSTALL_DEPENDENCIES} -eq 1 ] ; then
sudo zypper --non-interactive install ${DEPENDENCIES}
;;

linux-@(ubuntu|neon)-@(1[68]|20)*)
linux-@(ubuntu|neon)-@(1[68]|20|22)*)
RELEASE_VERSION=$(get-platform-trim "$(lsb_release -r)" | awk -F: '{print $2;}')
case "$RELEASE_VERSION" in
16*)
Expand All @@ -260,6 +260,9 @@ if [ ${INSTALL_DEPENDENCIES} -eq 1 ] ; then
20*)
UBUNTU_CODENAME="focal"
;;
22*)
UBUNTU_CODENAME="jammy"
;;
*)
puts "Release ${RELEASE_VERSION} for ${distro} not supported. Dependencies must be installed manually."
exit 1
Expand All @@ -277,11 +280,23 @@ if [ ${INSTALL_DEPENDENCIES} -eq 1 ] ; then
fi

# Adding .NET repository
${WGET} -q https://packages.microsoft.com/config/ubuntu/${RELEASE_VERSION}/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
sudo dpkg -i packages-microsoft-prod.deb
# On Ubuntu 22.04, use the 20.04 package config because .NET 5.0 might not be available in the 22.04 feed.
MS_REPO_VERSION=${RELEASE_VERSION}
if [[ "$RELEASE_VERSION" == 22* ]]; then
MS_REPO_VERSION="20.04"
fi
${WGET} -q https://packages.microsoft.com/config/ubuntu/${MS_REPO_VERSION}/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
sudo DEBIAN_FRONTEND=noninteractive dpkg -i --force-confdef --force-confold packages-microsoft-prod.deb
rm -f packages-microsoft-prod.deb
sudo apt-get update

if [[ "$RELEASE_VERSION" == 22* ]]; then
# .NET 5.0 requires libssl1.1, which is not available in the default Ubuntu 22.04 repositories.
${WGET} http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb -O libssl1.1.deb
sudo DEBIAN_FRONTEND=noninteractive dpkg -i --force-confdef --force-confold libssl1.1.deb || true
rm -f libssl1.1.deb
fi

sudo apt-get install -y ${DEPENDENCIES}
;;

Expand All @@ -290,7 +305,7 @@ if [ ${INSTALL_DEPENDENCIES} -eq 1 ] ; then
sudo yum -y install ninja-build
sudo rpm -U https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm
sudo yum -y install dotnet-sdk-5.0
sudo pip3 install pyyaml psutil toml
sudo pip3 install pyyaml psutil toml --break-system-packages || sudo pip3 install pyyaml psutil toml

mkdir -p ${DEPS_DIR}
cd ${DEPS_DIR}
Expand Down Expand Up @@ -519,7 +534,7 @@ fi

if [ ${INSTALL_DEV_DEPENDENCIES} -eq 1 ] ; then
sudo apt-get install -y python3-pip clang-format-${LLVM_SHORT_VERSION}
sudo pip3 install -U flake8
sudo pip3 install -U flake8 --break-system-packages || sudo pip3 install -U flake8
if [ "${GITHUB_ACTIONS}" = "true" ] ; then
exit 0
fi
Expand Down
1 change: 0 additions & 1 deletion share/smack/doctor.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ def green(text):


def check(text, condition):
global args
global count
if condition:
if not args.quiet:
Expand Down
Loading