From ebf023e7b41cf41b8ce0afd495c0b7ba45432c74 Mon Sep 17 00:00:00 2001 From: Isaac Brodsky Date: Thu, 19 Feb 2026 09:25:07 -0800 Subject: [PATCH 1/2] github actions update #201 --- .github/workflows/release.yml | 24 +++++++++--------- .github/workflows/tests.yml | 48 +++++++++++++++++------------------ .github/workflows/website.yml | 6 ++--- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c61be2f..3ae12b0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,11 +39,11 @@ jobs: ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: recursive - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v5 with: distribution: "${{ matrix.java-distribution }}" java-version: "${{ matrix.java-version }}" @@ -52,7 +52,7 @@ jobs: with: gradle-version: wrapper - - uses: actions/cache@v4 + - uses: actions/cache@v5 id: gradle-cache with: path: | @@ -67,7 +67,7 @@ jobs: env: OCI_EXE: docker - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v6 name: Upload artifacts with: name: docker-built-shared-objects-${{ matrix.dockcross-only }} @@ -88,11 +88,11 @@ jobs: java-version: [11] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: recursive - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v5 with: distribution: "${{ matrix.java-distribution }}" java-version: "${{ matrix.java-version }}" @@ -101,7 +101,7 @@ jobs: with: gradle-version: wrapper - - uses: actions/cache@v4 + - uses: actions/cache@v5 id: gradle-cache with: path: | @@ -114,7 +114,7 @@ jobs: - name: Tests run: ./gradlew clean test - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v6 name: Upload Mac OS Artifacts with: name: macos-built-shared-objects @@ -132,10 +132,10 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: distribution: "temurin" java-version: "21" @@ -167,14 +167,14 @@ jobs: git push origin HEAD:master --follow-tags - name: Download Docker binaries - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v7 with: pattern: docker-built-shared-objects-* merge-multiple: true path: src/main/resources/ - name: Download Mac binaries - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v7 with: name: macos-built-shared-objects path: src/main/resources/ diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 88c82e7..a118c34 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,11 +22,11 @@ jobs: dockcross-only: ["android-arm", "android-arm64", "linux-arm64", "linux-armv5", "linux-armv7", "linux-s390x", "linux-ppc64le", "linux-x64", "linux-x86", "windows-static-x64", "windows-static-x86"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: recursive - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v5 with: distribution: "${{ matrix.java-distribution }}" java-version: "${{ matrix.java-version }}" @@ -35,7 +35,7 @@ jobs: with: gradle-version: wrapper - - uses: actions/cache@v4 + - uses: actions/cache@v5 id: gradle-cache with: path: | @@ -56,7 +56,7 @@ jobs: - name: Format check for C run: git diff --exit-code - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v6 name: Upload artifacts if: ${{ matrix.java-version == 11 }} with: @@ -79,11 +79,11 @@ jobs: dockcross-only: ["android-arm", "android-arm64", "linux-arm64", "linux-armv5", "linux-armv7", "linux-s390x", "linux-ppc64le", "linux-x64", "linux-x86", "windows-static-x64", "windows-static-x86"] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: recursive - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: distribution: "${{ matrix.java-distribution }}" java-version: "${{ matrix.java-version }}" @@ -92,7 +92,7 @@ jobs: with: gradle-version: wrapper - - uses: actions/cache@v4 + - uses: actions/cache@v5 id: gradle-cache with: path: | @@ -120,11 +120,11 @@ jobs: java-version: [11, 17, 21, 22] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: recursive - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v5 with: distribution: "${{ matrix.java-distribution }}" java-version: "${{ matrix.java-version }}" @@ -133,7 +133,7 @@ jobs: with: gradle-version: wrapper - - uses: actions/cache@v4 + - uses: actions/cache@v5 id: gradle-cache with: path: | @@ -146,7 +146,7 @@ jobs: - name: Tests run: ./gradlew clean test - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v6 name: Upload Mac OS Artifacts if: ${{ matrix.os == 'macos-latest' && matrix.java-version == 11 }} with: @@ -165,11 +165,11 @@ jobs: java-version: [21] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: recursive - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v5 with: distribution: "${{ matrix.java-distribution }}" java-version: "${{ matrix.java-version }}" @@ -178,7 +178,7 @@ jobs: with: gradle-version: wrapper - - uses: actions/cache@v4 + - uses: actions/cache@v5 id: gradle-cache with: path: | @@ -208,11 +208,11 @@ jobs: java-version: [11] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: recursive - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v5 with: distribution: "${{ matrix.java-distribution }}" java-version: "${{ matrix.java-version }}" @@ -221,7 +221,7 @@ jobs: with: gradle-version: wrapper - - uses: actions/cache@v4 + - uses: actions/cache@v5 id: gradle-cache with: path: | @@ -232,14 +232,14 @@ jobs: ${{ runner.os }}-gradle- - name: Download Docker binaries - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v7 with: pattern: docker-built-shared-objects-* merge-multiple: true path: src/main/resources/ - name: Download Mac binaries - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v7 with: name: macos-built-shared-objects path: src/main/resources/ @@ -264,11 +264,11 @@ jobs: java-version: [ 21 ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: submodules: recursive - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: distribution: "${{ matrix.java-distribution }}" java-version: "${{ matrix.java-version }}" @@ -277,7 +277,7 @@ jobs: with: gradle-version: wrapper - - uses: actions/cache@v4 + - uses: actions/cache@v5 id: gradle-cache with: path: | @@ -288,14 +288,14 @@ jobs: ${{ runner.os }}-gradle- - name: Download Docker binaries - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v7 with: pattern: docker-built-shared-objects-* merge-multiple: true path: src/main/resources/ - name: Download Mac binaries - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v7 with: name: macos-built-shared-objects path: src/main/resources/ diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 6afa096..ac95ceb 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -15,9 +15,9 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v5 with: distribution: "adopt" java-version: "15" @@ -27,7 +27,7 @@ jobs: gradle-version: wrapper - name: Setup Gradle Cache - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: | ~/.gradle/caches From 3ac5fa52fd46d448c986bd51f63a7e03f892207f Mon Sep 17 00:00:00 2001 From: Isaac Brodsky Date: Thu, 19 Feb 2026 10:57:53 -0800 Subject: [PATCH 2/2] invert mac cross compile --- src/main/c/h3-java/build-h3.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/c/h3-java/build-h3.sh b/src/main/c/h3-java/build-h3.sh index 0e0c50f..61f9703 100755 --- a/src/main/c/h3-java/build-h3.sh +++ b/src/main/c/h3-java/build-h3.sh @@ -129,12 +129,12 @@ esac mkdir -p src/main/resources/$LIBRARY_DIR cp target/h3-java-build/lib/libh3-java* src/main/resources/$LIBRARY_DIR -# Cross compile from Mac x64 to Mac arm64 -if [ "$(uname -sm)" == "Darwin x86_64" ]; then +# Cross compile from Mac arm64 to Mac x64 +if [ "$(uname -sm)" == "Darwin arm64" ]; then pushd target - mkdir -p h3-java-build-mac-arm64 - pushd h3-java-build-mac-arm64 + mkdir -p h3-java-build-mac-x64 + pushd h3-java-build-mac-x64 mkdir -p build pushd build @@ -142,7 +142,7 @@ if [ "$(uname -sm)" == "Darwin x86_64" ]; then cmake -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_OSX_ARCHITECTURES="arm64" \ + -DCMAKE_OSX_ARCHITECTURES="x86_64" \ ../../h3 cmake --build . --target h3 --config Release H3_BUILD_ROOT="$(pwd)" @@ -153,7 +153,7 @@ if [ "$(uname -sm)" == "Darwin x86_64" ]; then -DBUILD_SHARED_LIBS=ON \ "-DH3_BUILD_ROOT=$H3_BUILD_ROOT" \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_OSX_ARCHITECTURES="arm64" \ + -DCMAKE_OSX_ARCHITECTURES="x86_64" \ ../../src/main/c/h3-java cmake --build . --target h3-java --config Release @@ -161,8 +161,8 @@ if [ "$(uname -sm)" == "Darwin x86_64" ]; then popd # target - mkdir -p src/main/resources/darwin-arm64 - cp target/h3-java-build-mac-arm64/lib/libh3-java* src/main/resources/darwin-arm64 + mkdir -p src/main/resources/darwin-x64 + cp target/h3-java-build-mac-x64/lib/libh3-java* src/main/resources/darwin-x64 fi #