Skip to content

Commit

Permalink
bump llvm, cxx common, xcode, macos, remill
Browse files Browse the repository at this point in the history
  • Loading branch information
2over12 committed Oct 3, 2023
1 parent 34b180f commit d0fc4e1
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -386,11 +386,11 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["macos-12"]
llvm: ["16"]
cxxcommon_version: ["v0.3.2"]
os: ["macos-13"]
llvm: ["17"]
cxxcommon_version: ["v0.6.0"]

runs-on: macos-12
runs-on: macos-13

steps:
- name: Setup the build paths
Expand Down Expand Up @@ -465,7 +465,7 @@ jobs:
id: cxxcommon_installer
working-directory: ${{ steps.build_paths.outputs.DOWNLOADS }}
run: |
folder_name="vcpkg_${{ matrix.os }}_llvm-${{ matrix.llvm }}_xcode-14.2_amd64"
folder_name="vcpkg_${{ matrix.os }}_llvm-${{ matrix.llvm }}_xcode-15.0_amd64"
archive_name="${folder_name}.tar.xz"
url="https://github.com/lifting-bits/cxx-common/releases/download/${{ matrix.cxxcommon_version}}/${archive_name}"
Expand Down Expand Up @@ -728,7 +728,7 @@ jobs:

strategy:
matrix:
llvm: ["16"]
llvm: ["17"]
ubuntu: ["22.04"]
steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG LLVM_VERSION=16
ARG LLVM_VERSION=17
ARG ARCH=amd64
ARG UBUNTU_VERSION=22.04
ARG CXX_COMMON_VERSION=0.3.2
ARG CXX_COMMON_VERSION=0.6.0
ARG DISTRO_BASE=ubuntu${UBUNTU_VERSION}
ARG BUILD_BASE=ubuntu:${UBUNTU_VERSION}
ARG LIBRARIES=/opt/trailofbits
Expand Down
2 changes: 1 addition & 1 deletion remill
16 changes: 8 additions & 8 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ CURR_DIR=$( pwd )
BUILD_DIR="${CURR_DIR}/anvill-build"
REMILL_BUILD_DIR="${CURR_DIR}/remill-build"
INSTALL_DIR=/usr/local
LLVM_VERSION=llvm-16
CXX_COMMON_VERSION="0.3.2"
LLVM_VERSION=llvm-17
CXX_COMMON_VERSION="0.6.0"
OS_VERSION=unknown
ARCH_VERSION=unknown
BUILD_FLAGS=
Expand Down Expand Up @@ -175,11 +175,11 @@ function DownloadLibraries

#BUILD_FLAGS="${BUILD_FLAGS} -DCMAKE_OSX_SYSROOT=${sdk_root}"
# Min version supported
OS_VERSION="macos-12"
XCODE_VERSION="14.2"
OS_VERSION="macos-13"
XCODE_VERSION="15.0"
if [[ "${SYSTEM_VERSION}" == "13.*" ]]; then
echo "Found MacOS Ventura"
OS_VERSION="macos-12"
OS_VERSION="macos-13"
elif [[ "${SYSTEM_VERSION}" == "12.*" ]]; then
echo "Found MacOS Monterey"
OS_VERSION="macos-12"
Expand Down Expand Up @@ -341,8 +341,8 @@ function Package
function GetLLVMVersion
{
case ${1} in
16)
LLVM_VERSION=llvm-16
17)
LLVM_VERSION=llvm-17
return 0
;;
*)
Expand All @@ -360,7 +360,7 @@ function Help
echo ""
echo "Options:"
echo " --prefix Change the default (${INSTALL_DIR}) installation prefix."
echo " --llvm-version Change the default (16) LLVM version."
echo " --llvm-version Change the default (17) LLVM version."
echo " --build-dir Change the default (${BUILD_DIR}) build directory."
echo " --debug Build with Debug symbols."
echo " --extra-cmake-args Extra CMake arguments to build with."
Expand Down

0 comments on commit d0fc4e1

Please sign in to comment.