Skip to content

Commit

Permalink
Bump to LLVM 16.0.2 (#1452)
Browse files Browse the repository at this point in the history
* add zstd dep

* use ubuntu latest

* Update build.sh

* split docker publish, fix build.sh

* rm original docker publish yml
  • Loading branch information
jumormt authored Apr 30, 2024
1 parent e23955a commit 7b4a6e7
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 18 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/docker_publish_arm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Docker

on:
push:
branches: [ master ]

jobs:
docker-publish:
if: github.repository == 'SVF-tools/SVF'
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: ${{secrets.DOCKER_USER}}
password: ${{secrets.DOCKER_PASSWD}}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Build and push arm image
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile
push: true
tags: ${{secrets.DOCKER_USER}}/svf:latest-aarch64
platforms: linux/arm64

Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,6 @@ jobs:
file: ./Dockerfile
push: true
tags: ${{secrets.DOCKER_USER}}/svf:latest
platforms: linux/amd64

- name: Build and push arm image
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile
push: true
tags: ${{secrets.DOCKER_USER}}/svf:latest-aarch64
platforms: linux/arm64

dispatch:
needs: docker-publish
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/github-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
XCODE_VERSION: '15.3.0'
strategy:
matrix:
os: [ubuntu-20.04, macos-latest]
os: [ubuntu-latest, macos-latest]
include:
- os: [ubuntu-20.04]
- os: [ubuntu-latest]
sanitizer: address
steps:
# checkout the repo
Expand All @@ -40,7 +40,7 @@ jobs:
sudo apt-get update
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get install cmake gcc g++ nodejs doxygen graphviz lcov
sudo apt-get install cmake gcc g++ nodejs doxygen graphviz lcov libzstd-dev
# build-svf
- name: build-svf
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/svf-lib_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
XCODE_VERSION: '15.3.0' # Define Xcode version here to reuse it
strategy:
matrix:
os: [ubuntu-20.04, macos-latest]
os: [ubuntu-latest, macos-latest]
steps:
# checkout the repo
- uses: actions/checkout@v2
Expand All @@ -40,7 +40,7 @@ jobs:
sudo apt-get update
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get install cmake gcc g++ nodejs doxygen graphviz
sudo apt-get install cmake gcc g++ nodejs doxygen graphviz libzstd-dev
sudo apt-get update
sudo apt-get install -y astyle
- name: env-setup
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ENV llvm_version=16.0.0
ENV HOME=/home/SVF-tools

# Define dependencies.
ENV lib_deps="cmake g++ gcc git zlib1g-dev libncurses5-dev libtinfo5 build-essential libssl-dev libpcre2-dev zip vim"
ENV lib_deps="cmake g++ gcc git zlib1g-dev libncurses5-dev libtinfo5 build-essential libssl-dev libpcre2-dev zip vim libzstd-dev"
ENV build_deps="wget xz-utils git gdb tcl python-is-python3"

# Fetch dependencies.
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ SVFHOME="${SCRIPT_DIR}"
sysOS=$(uname -s)
arch=$(uname -m)
MajorLLVMVer=16
LLVMVer=${MajorLLVMVer}.0.0
LLVMVer=${MajorLLVMVer}.0.2
UbuntuArmLLVM="https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVMVer}/clang+llvm-${LLVMVer}-aarch64-linux-gnu.tar.xz"
UbuntuLLVM="https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVMVer}/clang+llvm-${LLVMVer}-x86_64-linux-gnu-ubuntu-18.04.tar.xz"
UbuntuLLVM="https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVMVer}/clang+llvm-${LLVMVer}-x86_64-linux-gnu-ubuntu-22.04.tar.xz"
SourceLLVM="https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-${LLVMVer}.zip"
UbuntuZ3="https://github.com/Z3Prover/z3/releases/download/z3-4.8.8/z3-4.8.8-x64-ubuntu-16.04.zip"
UbuntuZ3Arm="https://github.com/SVF-tools/SVF-npm/raw/prebuilt-libs/z3-4.8.7-aarch64-ubuntu.zip"
Expand Down

0 comments on commit 7b4a6e7

Please sign in to comment.