Skip to content

Commit 4e16a51

Browse files
isaacbrodskyisaacbrodsky
authored
github actions update (#203)
* github actions update #201 * invert mac cross compile
1 parent b02e953 commit 4e16a51

4 files changed

Lines changed: 47 additions & 47 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ jobs:
3939
]
4040

4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v6
4343
with:
4444
submodules: recursive
4545

46-
- uses: actions/setup-java@v2
46+
- uses: actions/setup-java@v5
4747
with:
4848
distribution: "${{ matrix.java-distribution }}"
4949
java-version: "${{ matrix.java-version }}"
@@ -52,7 +52,7 @@ jobs:
5252
with:
5353
gradle-version: wrapper
5454

55-
- uses: actions/cache@v4
55+
- uses: actions/cache@v5
5656
id: gradle-cache
5757
with:
5858
path: |
@@ -67,7 +67,7 @@ jobs:
6767
env:
6868
OCI_EXE: docker
6969

70-
- uses: actions/upload-artifact@v4
70+
- uses: actions/upload-artifact@v6
7171
name: Upload artifacts
7272
with:
7373
name: docker-built-shared-objects-${{ matrix.dockcross-only }}
@@ -88,11 +88,11 @@ jobs:
8888
java-version: [11]
8989

9090
steps:
91-
- uses: actions/checkout@v4
91+
- uses: actions/checkout@v6
9292
with:
9393
submodules: recursive
9494

95-
- uses: actions/setup-java@v2
95+
- uses: actions/setup-java@v5
9696
with:
9797
distribution: "${{ matrix.java-distribution }}"
9898
java-version: "${{ matrix.java-version }}"
@@ -101,7 +101,7 @@ jobs:
101101
with:
102102
gradle-version: wrapper
103103

104-
- uses: actions/cache@v4
104+
- uses: actions/cache@v5
105105
id: gradle-cache
106106
with:
107107
path: |
@@ -114,7 +114,7 @@ jobs:
114114
- name: Tests
115115
run: ./gradlew clean test
116116

117-
- uses: actions/upload-artifact@v4
117+
- uses: actions/upload-artifact@v6
118118
name: Upload Mac OS Artifacts
119119
with:
120120
name: macos-built-shared-objects
@@ -132,10 +132,10 @@ jobs:
132132

133133
steps:
134134
- name: Check out code
135-
uses: actions/checkout@v3
135+
uses: actions/checkout@v6
136136

137137
- name: Set up JDK
138-
uses: actions/setup-java@v3
138+
uses: actions/setup-java@v5
139139
with:
140140
distribution: "temurin"
141141
java-version: "21"
@@ -167,14 +167,14 @@ jobs:
167167
git push origin HEAD:master --follow-tags
168168
169169
- name: Download Docker binaries
170-
uses: actions/download-artifact@v4.1.7
170+
uses: actions/download-artifact@v7
171171
with:
172172
pattern: docker-built-shared-objects-*
173173
merge-multiple: true
174174
path: src/main/resources/
175175

176176
- name: Download Mac binaries
177-
uses: actions/download-artifact@v4.1.7
177+
uses: actions/download-artifact@v7
178178
with:
179179
name: macos-built-shared-objects
180180
path: src/main/resources/

‎.github/workflows/tests.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
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"]
2323

2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v6
2626
with:
2727
submodules: recursive
2828

29-
- uses: actions/setup-java@v2
29+
- uses: actions/setup-java@v5
3030
with:
3131
distribution: "${{ matrix.java-distribution }}"
3232
java-version: "${{ matrix.java-version }}"
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
gradle-version: wrapper
3737

38-
- uses: actions/cache@v4
38+
- uses: actions/cache@v5
3939
id: gradle-cache
4040
with:
4141
path: |
@@ -56,7 +56,7 @@ jobs:
5656
- name: Format check for C
5757
run: git diff --exit-code
5858

59-
- uses: actions/upload-artifact@v4
59+
- uses: actions/upload-artifact@v6
6060
name: Upload artifacts
6161
if: ${{ matrix.java-version == 11 }}
6262
with:
@@ -79,11 +79,11 @@ jobs:
7979
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"]
8080

8181
steps:
82-
- uses: actions/checkout@v4
82+
- uses: actions/checkout@v6
8383
with:
8484
submodules: recursive
8585

86-
- uses: actions/setup-java@v4
86+
- uses: actions/setup-java@v5
8787
with:
8888
distribution: "${{ matrix.java-distribution }}"
8989
java-version: "${{ matrix.java-version }}"
@@ -92,7 +92,7 @@ jobs:
9292
with:
9393
gradle-version: wrapper
9494

95-
- uses: actions/cache@v4
95+
- uses: actions/cache@v5
9696
id: gradle-cache
9797
with:
9898
path: |
@@ -120,11 +120,11 @@ jobs:
120120
java-version: [11, 17, 21, 22]
121121

122122
steps:
123-
- uses: actions/checkout@v4
123+
- uses: actions/checkout@v6
124124
with:
125125
submodules: recursive
126126

127-
- uses: actions/setup-java@v2
127+
- uses: actions/setup-java@v5
128128
with:
129129
distribution: "${{ matrix.java-distribution }}"
130130
java-version: "${{ matrix.java-version }}"
@@ -133,7 +133,7 @@ jobs:
133133
with:
134134
gradle-version: wrapper
135135

136-
- uses: actions/cache@v4
136+
- uses: actions/cache@v5
137137
id: gradle-cache
138138
with:
139139
path: |
@@ -146,7 +146,7 @@ jobs:
146146
- name: Tests
147147
run: ./gradlew clean test
148148

149-
- uses: actions/upload-artifact@v4
149+
- uses: actions/upload-artifact@v6
150150
name: Upload Mac OS Artifacts
151151
if: ${{ matrix.os == 'macos-latest' && matrix.java-version == 11 }}
152152
with:
@@ -165,11 +165,11 @@ jobs:
165165
java-version: [21]
166166

167167
steps:
168-
- uses: actions/checkout@v4
168+
- uses: actions/checkout@v6
169169
with:
170170
submodules: recursive
171171

172-
- uses: actions/setup-java@v2
172+
- uses: actions/setup-java@v5
173173
with:
174174
distribution: "${{ matrix.java-distribution }}"
175175
java-version: "${{ matrix.java-version }}"
@@ -178,7 +178,7 @@ jobs:
178178
with:
179179
gradle-version: wrapper
180180

181-
- uses: actions/cache@v4
181+
- uses: actions/cache@v5
182182
id: gradle-cache
183183
with:
184184
path: |
@@ -208,11 +208,11 @@ jobs:
208208
java-version: [11]
209209

210210
steps:
211-
- uses: actions/checkout@v4
211+
- uses: actions/checkout@v6
212212
with:
213213
submodules: recursive
214214

215-
- uses: actions/setup-java@v2
215+
- uses: actions/setup-java@v5
216216
with:
217217
distribution: "${{ matrix.java-distribution }}"
218218
java-version: "${{ matrix.java-version }}"
@@ -221,7 +221,7 @@ jobs:
221221
with:
222222
gradle-version: wrapper
223223

224-
- uses: actions/cache@v4
224+
- uses: actions/cache@v5
225225
id: gradle-cache
226226
with:
227227
path: |
@@ -232,14 +232,14 @@ jobs:
232232
${{ runner.os }}-gradle-
233233
234234
- name: Download Docker binaries
235-
uses: actions/download-artifact@v4.1.7
235+
uses: actions/download-artifact@v7
236236
with:
237237
pattern: docker-built-shared-objects-*
238238
merge-multiple: true
239239
path: src/main/resources/
240240

241241
- name: Download Mac binaries
242-
uses: actions/download-artifact@v4.1.7
242+
uses: actions/download-artifact@v7
243243
with:
244244
name: macos-built-shared-objects
245245
path: src/main/resources/
@@ -264,11 +264,11 @@ jobs:
264264
java-version: [ 21 ]
265265

266266
steps:
267-
- uses: actions/checkout@v4
267+
- uses: actions/checkout@v6
268268
with:
269269
submodules: recursive
270270

271-
- uses: actions/setup-java@v4
271+
- uses: actions/setup-java@v5
272272
with:
273273
distribution: "${{ matrix.java-distribution }}"
274274
java-version: "${{ matrix.java-version }}"
@@ -277,7 +277,7 @@ jobs:
277277
with:
278278
gradle-version: wrapper
279279

280-
- uses: actions/cache@v4
280+
- uses: actions/cache@v5
281281
id: gradle-cache
282282
with:
283283
path: |
@@ -288,14 +288,14 @@ jobs:
288288
${{ runner.os }}-gradle-
289289
290290
- name: Download Docker binaries
291-
uses: actions/download-artifact@v4.1.7
291+
uses: actions/download-artifact@v7
292292
with:
293293
pattern: docker-built-shared-objects-*
294294
merge-multiple: true
295295
path: src/main/resources/
296296

297297
- name: Download Mac binaries
298-
uses: actions/download-artifact@v4.1.7
298+
uses: actions/download-artifact@v7
299299
with:
300300
name: macos-built-shared-objects
301301
path: src/main/resources/

‎.github/workflows/website.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
runs-on: ubuntu-22.04
1616

1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919

20-
- uses: actions/setup-java@v4
20+
- uses: actions/setup-java@v5
2121
with:
2222
distribution: "adopt"
2323
java-version: "15"
@@ -27,7 +27,7 @@ jobs:
2727
gradle-version: wrapper
2828

2929
- name: Setup Gradle Cache
30-
uses: actions/cache@v4
30+
uses: actions/cache@v5
3131
with:
3232
path: |
3333
~/.gradle/caches

‎src/main/c/h3-java/build-h3.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,20 +129,20 @@ esac
129129
mkdir -p src/main/resources/$LIBRARY_DIR
130130
cp target/h3-java-build/lib/libh3-java* src/main/resources/$LIBRARY_DIR
131131

132-
# Cross compile from Mac x64 to Mac arm64
133-
if [ "$(uname -sm)" == "Darwin x86_64" ]; then
132+
# Cross compile from Mac arm64 to Mac x64
133+
if [ "$(uname -sm)" == "Darwin arm64" ]; then
134134
pushd target
135135

136-
mkdir -p h3-java-build-mac-arm64
137-
pushd h3-java-build-mac-arm64
136+
mkdir -p h3-java-build-mac-x64
137+
pushd h3-java-build-mac-x64
138138

139139
mkdir -p build
140140
pushd build
141141

142142
cmake -DBUILD_SHARED_LIBS=OFF \
143143
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
144144
-DCMAKE_BUILD_TYPE=Release \
145-
-DCMAKE_OSX_ARCHITECTURES="arm64" \
145+
-DCMAKE_OSX_ARCHITECTURES="x86_64" \
146146
../../h3
147147
cmake --build . --target h3 --config Release
148148
H3_BUILD_ROOT="$(pwd)"
@@ -153,16 +153,16 @@ if [ "$(uname -sm)" == "Darwin x86_64" ]; then
153153
-DBUILD_SHARED_LIBS=ON \
154154
"-DH3_BUILD_ROOT=$H3_BUILD_ROOT" \
155155
-DCMAKE_BUILD_TYPE=Release \
156-
-DCMAKE_OSX_ARCHITECTURES="arm64" \
156+
-DCMAKE_OSX_ARCHITECTURES="x86_64" \
157157
../../src/main/c/h3-java
158158
cmake --build . --target h3-java --config Release
159159

160160
popd # h3-java-build
161161

162162
popd # target
163163

164-
mkdir -p src/main/resources/darwin-arm64
165-
cp target/h3-java-build-mac-arm64/lib/libh3-java* src/main/resources/darwin-arm64
164+
mkdir -p src/main/resources/darwin-x64
165+
cp target/h3-java-build-mac-x64/lib/libh3-java* src/main/resources/darwin-x64
166166
fi
167167

168168
#

0 commit comments

Comments
 (0)