Skip to content

github actions update #203

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

Merged
isaacbrodsky merged 2 commits into from
Feb 19, 2026
+47 −47
Merged

github actions update #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebf023e
github actions update #201
isaacbrodsky Feb 19, 2026
3ac5fa5
invert mac cross compile
isaacbrodsky Feb 19, 2026
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
24 changes: 12 additions & 12 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand All @@ -52,7 +52,7 @@ jobs:
with:
gradle-version: wrapper

- uses: actions/cache@v4
- uses: actions/cache@v5
id: gradle-cache
with:
path: |
Expand All @@ -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 }}
Expand All @@ -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 }}"
Expand All @@ -101,7 +101,7 @@ jobs:
with:
gradle-version: wrapper

- uses: actions/cache@v4
- uses: actions/cache@v5
id: gradle-cache
with:
path: |
Expand All @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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/
Expand Down
48 changes: 24 additions & 24 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand All @@ -35,7 +35,7 @@ jobs:
with:
gradle-version: wrapper

- uses: actions/cache@v4
- uses: actions/cache@v5
id: gradle-cache
with:
path: |
Expand All @@ -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:
Expand All @@ -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 }}"
Expand All @@ -92,7 +92,7 @@ jobs:
with:
gradle-version: wrapper

- uses: actions/cache@v4
- uses: actions/cache@v5
id: gradle-cache
with:
path: |
Expand Down Expand Up @@ -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 }}"
Expand All @@ -133,7 +133,7 @@ jobs:
with:
gradle-version: wrapper

- uses: actions/cache@v4
- uses: actions/cache@v5
id: gradle-cache
with:
path: |
Expand All @@ -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:
Expand All @@ -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 }}"
Expand All @@ -178,7 +178,7 @@ jobs:
with:
gradle-version: wrapper

- uses: actions/cache@v4
- uses: actions/cache@v5
id: gradle-cache
with:
path: |
Expand Down Expand Up @@ -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 }}"
Expand All @@ -221,7 +221,7 @@ jobs:
with:
gradle-version: wrapper

- uses: actions/cache@v4
- uses: actions/cache@v5
id: gradle-cache
with:
path: |
Expand All @@ -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/
Expand All @@ -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 }}"
Expand All @@ -277,7 +277,7 @@ jobs:
with:
gradle-version: wrapper

- uses: actions/cache@v4
- uses: actions/cache@v5
id: gradle-cache
with:
path: |
Expand All @@ -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/
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/website.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -27,7 +27,7 @@ jobs:
gradle-version: wrapper

- name: Setup Gradle Cache
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: |
~/.gradle/caches
Expand Down
16 changes: 8 additions & 8 deletions src/main/c/h3-java/build-h3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,20 +129,20 @@ 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

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)"
Expand All @@ -153,16 +153,16 @@ 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

popd # h3-java-build

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

#
Expand Down