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

Bump macos version #1609

Merged
merged 14 commits into from
Oct 14, 2024
Merged

Bump macos version #1609

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4133758
Bump macos version
egecetin Oct 5, 2024
61a821f
bump android runners
egecetin Oct 5, 2024
ae0fc43
maybe 14 supports?
egecetin Oct 5, 2024
340e824
Revert "maybe 14 supports?"
egecetin Oct 5, 2024
d65e8d2
update packaging
egecetin Oct 10, 2024
ddd8863
fix xcode-versions
egecetin Oct 10, 2024
9f65a79
what about 16.0.0
egecetin Oct 10, 2024
8613ef5
use arm64
egecetin Oct 11, 2024
204aaea
adjust n builds
egecetin Oct 11, 2024
54e62ba
add missing macos14
egecetin Oct 11, 2024
0fce87c
zstd
egecetin Oct 11, 2024
c7f4ab5
try macos-13
egecetin Oct 13, 2024
fc15c6c
revert android builds to macos12 for now
egecetin Oct 14, 2024
70e26c3
Merge branch 'dev' into bump-macos
egecetin Oct 14, 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
20 changes: 10 additions & 10 deletions .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,14 +289,6 @@ jobs:
strategy:
matrix:
include:
- os-version: macos-12
host-arch: x86_64
arch: x86_64
config-zstd: OFF
- os-version: macos-12
host-arch: x86_64
arch: arm64
config-zstd: OFF
- os-version: macos-13
host-arch: x86_64
arch: x86_64
Expand All @@ -313,6 +305,14 @@ jobs:
host-arch: arm64
arch: arm64
config-zstd: OFF
- os-version: macos-15
host-arch: x86_64
arch: x86_64
config-zstd: OFF
- os-version: macos-15
host-arch: x86_64
arch: arm64
config-zstd: OFF

steps:
- name: Checkout code
Expand Down Expand Up @@ -628,11 +628,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
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To unblock this PR until we figure out the Android build, can we change it to a working version, maybe macos-13 or macos-14?

Copy link
Collaborator Author

@egecetin egecetin Oct 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@seladb No luck even macos-13 fails but I just noticed, android packaging only runs with ubuntu-latest for different target architectures. What about just testing with ubuntu and targeting archs also?

Copy link
Owner

@seladb seladb Oct 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So maybe move it back to macos 12 until we figure it out?

Copy link
Collaborator

@clementperon clementperon Oct 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@seladb I have open a MR to bump gradle https://github.com/seladb/ToyVpn-PcapPlusPlus/pull/10/files

This is the latest gradle version that support Android SDK 30.
But I think we should consider bumping ToyVpn SDK target version

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@clementperon unfortunately ToyVpn doesn't have CI so the only way to know if your PR works is use the PR branch in PcapPlusPlus CI. It should be pretty easy to do using this change in build_and_test.yml:

- name: Checkout ToyVpn-PcapPlusPlus
   uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # master
   with:
     repository: clementperon/ToyVpn-PcapPlusPlus
     ref: bump_gradle
     path: ./ToyVpn-PcapPlusPlus
     submodules: true

BTW, I'm considering re-writing the ToyVpn example using modern Kotlin and build tools, but this will take time because I'm not familiar with Android development...

Copy link
Collaborator Author

@egecetin egecetin Oct 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@seladb Sure I'll move it to MacOS-12 for now. We still have approx two months for MacOS-12 until completely removed. Only reminder is beware of brownouts. It might fail during some runs.

target: x86_64
cmake_configure: "-DCMAKE_OSX_ARCHITECTURES=x86_64"
api-version: 30
Expand Down
23 changes: 20 additions & 3 deletions .github/workflows/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,32 @@ jobs:
artifacts: "${{ env.BUILD_DIR }}/*.tar.gz"

macos:
runs-on: macos-14
runs-on: ${{ matrix.os-version }}
permissions:
contents: write
attestations: write
id-token: write
strategy:
matrix:
xcode-version: [15.4, 14.3.1]
arch: [x86_64, arm64]
include:
- os-version: macos-14
xcode-version: 15.4
arch: x86_64
- os-version: macos-14
xcode-version: 15.4
arch: arm64
- os-version: macos-14
xcode-version: 14.3.1
arch: x86_64
- os-version: macos-14
xcode-version: 14.3.1
arch: arm64
- os-version: macos-15
xcode-version: 16.0.0
arch: x86_64
- os-version: macos-15
xcode-version: 16.0.0
arch: arm64

steps:
- uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
Expand Down
Loading