Skip to content
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

Jump to bottom

Use latest prebuilt cxx-common #133

Merged
merged 5 commits into from
Apr 28, 2021
Merged

Use latest prebuilt cxx-common #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1394498
Use latest prebuilt cxx-common
ekilmer Apr 28, 2021
93f5f3b
Update macos paths
ekilmer Apr 28, 2021
0c84d49
Fix more paths in new vcpkg release
ekilmer Apr 28, 2021
45a9f8b
ci: More path munging
ekilmer Apr 28, 2021
afb7591
ci: Fix mac to get absolute path
ekilmer Apr 28, 2021
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
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
env CTEST_OUTPUT_ON_FAILURE=1 cmake --build . --target test

# Run tests manually (kinda ugly, so use CMake way)
CLANG_BIN="$(find ../../pre-built-llvm-${{ matrix.llvm }} -name clang | grep "bin/clang")"
CLANG_BIN="$(find ../../pre-built-llvm-${{ matrix.llvm }} -path "*/tools/llvm-${{ matrix.llvm }}/clang" -exec readlink -f {} \; )"
../scripts/roundtrip.py "./tools/rellic-decomp-${{ matrix.llvm }}.0" ../tests/tools/decomp "${CLANG_BIN}"
../scripts/roundtrip.py --translate-only "./tools/rellic-decomp-${{ matrix.llvm }}.0" ../tests/tools/decomp/failing-rebuild "${CLANG_BIN}"

Expand Down Expand Up @@ -122,9 +122,10 @@ jobs:
env CTEST_OUTPUT_ON_FAILURE=1 cmake --build . --target test

# Run tests manually (kinda ugly, so use CMake way)
CLANG_BIN="$(find ../../pre-built-llvm-${{ matrix.llvm }} -name clang | grep "bin/clang")"
CLANG_BIN="$(find ../../pre-built-llvm-${{ matrix.llvm }} -path "*/tools/llvm-${{ matrix.llvm }}/clang" -exec python -c "import os; print(os.path.abspath('{}'))" \; )"
../scripts/roundtrip.py "./tools/rellic-decomp-${{ matrix.llvm }}.0" ../tests/tools/decomp "${CLANG_BIN}"
../scripts/roundtrip.py --translate-only "./tools/rellic-decomp-${{ matrix.llvm }}.0" ../tests/tools/decomp/failing-rebuild "${CLANG_BIN}"

- name: Locate the packages
id: package_names
shell: bash
Expand Down
12 changes: 5 additions & 7 deletions scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ LLVM_VERSION=llvm-11
OS_VERSION=unknown
ARCH_VERSION=unknown
BUILD_FLAGS=
CXX_COMMON_VERSION="v0.1.1"
CXX_COMMON_VERSION="v0.1.3"

# There are pre-build versions of various libraries for specific
# Ubuntu releases.
Expand Down Expand Up @@ -180,17 +180,15 @@ function DownloadLibraries
#BUILD_FLAGS="${BUILD_FLAGS} -DCMAKE_OSX_SYSROOT=${sdk_root}"
# Min version supported
OS_VERSION="macos-10.15"
XCODE_VERSION="12.1.0"
# Hard-coded to match pre-built binaries in CI
XCODE_VERSION="12.4"
if [[ "$(sw_vers -productVersion)" == "10.15"* ]]; then
echo "Found MacOS Catalina"
OS_VERSION="macos-10.15"
# Hard-coded to match pre-built binaries in CI
XCODE_VERSION="12.1.0"
elif [[ "$(sw_vers -productVersion)" == "11."* ]]; then
echo "Found MacOS Big Sur"
OS_VERSION="macos-11.0"
# Hard-coded to match pre-built binaries in CI
XCODE_VERSION="12.2.0"
# Uses 10.15 binaries
OS_VERSION="macos-10.15"
else
echo "WARNING: ****Likely unsupported MacOS Version****"
echo "WARNING: ****Using ${OS_VERSION}****"
Expand Down