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

Drop llvm-15 + ubuntu 20.04 #1029

Merged
merged 18 commits into from
Aug 2, 2023
Merged

Drop llvm-15 + ubuntu 20.04 #1029

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
adff5c5
drop llvm-15 + ubuntu 20.04
Ninja3047 Jul 19, 2023
61f09c0
bump rellic
Ninja3047 Jul 19, 2023
6a25ca3
debug disk usage
Ninja3047 Jul 19, 2023
f50e294
Update vcpkg
ekilmer Jul 19, 2023
64a4ae9
bump rellic again
Ninja3047 Jul 28, 2023
eef64de
Fix clang path for rellic tests
ekilmer Jul 28, 2023
f066253
Disable ccache
ekilmer Jul 31, 2023
9d83f0a
Revert "Disable ccache"
ekilmer Jul 31, 2023
f903769
Upgrade to latest rellic
ekilmer Jul 31, 2023
088e881
Check space left on runner
ekilmer Jul 31, 2023
267a9a7
Fix rellic paths
ekilmer Jul 31, 2023
ad6a7cf
bump anvill/remill
Ninja3047 Jul 31, 2023
b7a8c2c
show du output
Ninja3047 Jul 31, 2023
daec94b
Add more du
ekilmer Aug 1, 2023
7d39b1a
Fix du
ekilmer Aug 1, 2023
81b11ca
du for possible cache dirs
ekilmer Aug 1, 2023
a1e37ba
Cleanup NuGet cache
ekilmer Aug 1, 2023
139e706
Use anvill patchable-ir-main
ekilmer Aug 1, 2023
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
13 changes: 9 additions & 4 deletions .github/workflows/vcpkg_ci_amd64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ jobs:
matrix:
image:
# 'name' is Docker image name whereas 'os' is more generic
- { os: 'ubuntu', name: 'ubuntu-v2', tag: '20.04' }
- { os: 'ubuntu', name: 'ubuntu-v2', tag: '22.04' }
llvm: [ 'llvm-15', 'llvm-16[pasta]', 'llvm-16' ]
llvm: [ 'llvm-16[pasta]', 'llvm-16' ]
target_arch: [ 'x64', 'arm64' ]

container:
Expand Down Expand Up @@ -84,11 +83,17 @@ jobs:
- name: Initialize vcpkg
shell: bash
run: |
df -h
ls -lah
{ read -r vcpkg_repo_url && read -r vcpkg_commit; } <./vcpkg_info.txt || exit 1
git clone "${vcpkg_repo_url}"
git -C vcpkg checkout "${vcpkg_commit}"
df -h
ls -lah
./vcpkg/bootstrap-vcpkg.sh
echo "VCPKG_ROOT=$(pwd)/vcpkg" >> $GITHUB_ENV
df -h
ls -lah

- name: 'vcpkg install dependencies'
shell: 'bash'
Expand Down Expand Up @@ -175,7 +180,7 @@ jobs:
- name: 'Rellic build'
shell: 'bash'
working-directory: rellic
if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
ekilmer marked this conversation as resolved.
Show resolved Hide resolved
if: matrix.target_arch == 'x64'
run: |
# Does not compile with gcc
export CC="$(which clang)"
Expand All @@ -192,7 +197,7 @@ jobs:
- name: 'Rellic test'
shell: 'bash'
working-directory: rellic/build
if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
if: matrix.target_arch == 'x64'
run: |
../scripts/roundtrip.py ./tools/rellic-decomp ../tests/tools/decomp "${VCPKG_ROOT}/installed/${TARGET_TRIPLET}/tools/llvm/clang"

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/vcpkg_ci_mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
matrix:
os:
- { runner: 'macos-12', xcode: '14.2' }
llvm: [ 'llvm-15', 'llvm-16[pasta]', 'llvm-16' ]
llvm: [ 'llvm-16[pasta]', 'llvm-16' ]
target_arch: [ 'x64', 'arm64' ]

runs-on: ${{ matrix.os.runner }}
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:
- name: 'Rellic build'
shell: 'bash'
working-directory: rellic
if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
if: matrix.target_arch == 'x64'
run: |
cmake -G Ninja \
-DCMAKE_VERBOSE_MAKEFILE=ON \
Expand All @@ -192,7 +192,7 @@ jobs:
- name: 'Rellic test'
shell: 'bash'
working-directory: rellic/build
if: contains(matrix.llvm, 'llvm-15') && matrix.target_arch == 'x64'
if: matrix.target_arch == 'x64'
run: |
# Test only should run when we're not cross compiling
../scripts/roundtrip.py ./tools/rellic-decomp ../tests/tools/decomp "${VCPKG_ROOT}/installed/${TARGET_TRIPLET}/tools/llvm/clang"
Expand Down
2 changes: 1 addition & 1 deletion vcpkg_info.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
https://github.com/trail-of-forks/vcpkg.git
fix-cross-compile-linux
cxx-common