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

Bump Android CI macOS version #1653

Merged
merged 23 commits into from
Dec 4, 2024
Merged

Bump Android CI macOS version #1653

Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b6a5050
Bump Android CI to run on macOS 15
seladb Dec 3, 2024
5585fa2
Try Clement's ToyVpn branch
seladb Dec 3, 2024
20e4788
Temp disable Ubuntu
seladb Dec 3, 2024
4e0a74f
Try macOS 14 which should have Java 8 installed
seladb Dec 3, 2024
1b34475
Set up JDK 8
seladb Dec 3, 2024
b1a5e0c
Add distro
seladb Dec 3, 2024
019ada0
Change distro to "zulu"
seladb Dec 3, 2024
02285ce
Update ToyVpn to a custom branch
seladb Dec 3, 2024
d2353e5
Update build_and_test.yml
seladb Dec 3, 2024
d33a1c4
Add more debug info
seladb Dec 3, 2024
2753262
Check CMake and Gradle versions
seladb Dec 3, 2024
7cff523
Update build_and_test.yml
seladb Dec 3, 2024
1996f3f
Update build_and_test.yml
seladb Dec 3, 2024
3ada14c
Update build_and_test.yml
seladb Dec 3, 2024
bbf1592
Update build_and_test.yml
seladb Dec 4, 2024
401b057
Update build_and_test.yml
seladb Dec 4, 2024
1aa0eb3
Update build_and_test.yml
seladb Dec 4, 2024
5054196
Update build_and_test.yml
seladb Dec 4, 2024
b60702b
Update build_and_test.yml
seladb Dec 4, 2024
7518a27
Update build_and_test.yml
seladb Dec 4, 2024
9010496
Update build_and_test.yml
seladb Dec 4, 2024
113ad30
Update build_and_test.yml
seladb Dec 4, 2024
6bb34b1
Update build_and_test.yml
seladb Dec 4, 2024
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
10 changes: 8 additions & 2 deletions .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,11 +630,11 @@ jobs:
- run-on-os: ubuntu-20.04
target: x86
api-version: 30
- run-on-os: macos-12
- run-on-os: macos-15
target: arm64-v8a
cmake_configure: "-DCMAKE_OSX_ARCHITECTURES=arm64"
api-version: 30
- run-on-os: macos-12
- run-on-os: macos-15
target: x86_64
cmake_configure: "-DCMAKE_OSX_ARCHITECTURES=x86_64"
api-version: 30
Expand Down Expand Up @@ -679,6 +679,12 @@ jobs:
mv ${TOYVPN_PCAPPLUSPLUS}/lib/*.a ${PCAPPLUSPLUS_LIBS_PATH}/
mv ${TOYVPN_PCAPPLUSPLUS}/include/pcapplusplus/*.h ${PCAPPLUSPLUS_INCLUDE_PATH}/

- name: Set up JDK 8
uses: actions/setup-java@v4
with:
java-version: "8"
distribution: "zulu"

- name: Build ToyVpn-PcapPlusPlus
working-directory: ./ToyVpn-PcapPlusPlus
run: |
Expand Down
Loading