Skip to content

Commit a676fea

Browse files
samunohitosamunohito
authored
Merge pull request #44 from hirosassa/fix-workflow
Update CI configuration
2 parents 90bd2e5 + f181810 commit a676fea

File tree

6 files changed

+36
-33
lines changed

6 files changed

+36
-33
lines changed

‎.github/workflows/gradle.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v4
1212
- name: Set up JDK 11
13-
uses: actions/setup-java@v1
13+
uses: actions/setup-java@v4
1414
with:
1515
java-version: 11
16+
distribution: 'temurin'
1617
- name: Set up Rust
17-
uses: actions-rs/[email protected]
18+
run: |
19+
rustup toolchain install stable --profile minimal
20+
rustup default stable
1821
- name: Grant execute permission for install_compiler_x86_64.sh
1922
run: chmod +x ./setup/install_compiler_x86_64.sh
2023
- name: Set up BuildTools

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Kanaria
33

44
このライブラリは、ひらがな・カタカナ、半角・全角の相互変換や判別を始めとした機能を提供します。
55

6-
![Gradle CI](https://github.com/sam-osamu/kanaria/workflows/Gradle%20CI/badge.svg?branch=develop)
6+
![Gradle CI](https://github.com/samunohito/kanaria/workflows/Gradle%20CI/badge.svg?branch=develop)
77

88
## Description
99

‎kanaria_jvm/build.gradle.kts

+10-10
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ tasks.getByName("install", Upload::class) {
105105
}
106106
}
107107

108-
val androidNdkPath = "$rootDir/libs/android-ndk-r20b/toolchains/llvm/prebuilt/linux-x86_64/bin"
108+
val androidNdkPath = "$rootDir/libs/android-ndk-r26d/toolchains/llvm/prebuilt/linux-x86_64/bin"
109109
rustic {
110110
projectSettings.projectLocation("$projectDir/src/main/rust")
111111
defaultConfig.defaultOptions.apply {
@@ -158,8 +158,8 @@ rustic {
158158

159159
create("i686-unknown-linux-gnu") {
160160
environments(mapOf(
161-
"AR" to "/usr/bin/i686-linux-gnu-gcc-ar-8",
162-
"CC" to "/usr/bin/i686-linux-gnu-gcc-8"
161+
"AR" to "/usr/bin/i686-linux-gnu-gcc-ar-12",
162+
"CC" to "/usr/bin/i686-linux-gnu-gcc-12"
163163
))
164164
defaultOptions.apply {
165165
target("i686-unknown-linux-gnu")
@@ -168,8 +168,8 @@ rustic {
168168

169169
create("x86_64-unknown-linux-gnu") {
170170
environments(mapOf(
171-
"AR" to "/usr/bin/x86_64-linux-gnu-gcc-ar-8",
172-
"CC" to "/usr/bin/x86_64-linux-gnu-gcc-8"
171+
"AR" to "/usr/bin/x86_64-linux-gnu-gcc-ar-12",
172+
"CC" to "/usr/bin/x86_64-linux-gnu-gcc-12"
173173
))
174174
defaultOptions.apply {
175175
target("x86_64-unknown-linux-gnu")
@@ -178,8 +178,8 @@ rustic {
178178

179179
create("arm-unknown-linux-gnueabihf") {
180180
environments(mapOf(
181-
"AR" to "/usr/bin/arm-linux-gnueabihf-gcc-ar-8",
182-
"CC" to "/usr/bin/arm-linux-gnueabihf-gcc-8"
181+
"AR" to "/usr/bin/arm-linux-gnueabihf-gcc-ar-12",
182+
"CC" to "/usr/bin/arm-linux-gnueabihf-gcc-12"
183183
))
184184
defaultOptions.apply {
185185
target("arm-unknown-linux-gnueabihf")
@@ -188,8 +188,8 @@ rustic {
188188

189189
create("aarch64-unknown-linux-gnu") {
190190
environments(mapOf(
191-
"AR" to "/usr/bin/aarch64-linux-gnu-gcc-ar-8",
192-
"CC" to "/usr/bin/aarch64-linux-gnu-gcc-8"
191+
"AR" to "/usr/bin/aarch64-linux-gnu-gcc-ar-12",
192+
"CC" to "/usr/bin/aarch64-linux-gnu-gcc-12"
193193
))
194194
defaultOptions.apply {
195195
target("aarch64-unknown-linux-gnu")
@@ -293,4 +293,4 @@ fun deployReleaseBuildOutput(tasks: TaskContainer, variant: com.osm.gradle.plugi
293293

294294
fun getOutputFileName(target: String?): String {
295295
return if (target != null && target.contains("windows")) "kanaria_jni.dll" else "libkanaria_jni.so"
296-
}
296+
}

‎kanaria_jvm/src/main/rust/.cargo/config

+12-12
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,37 @@ linker = "/usr/bin/i686-w64-mingw32-gcc"
55
linker = "/usr/bin/x86_64-w64-mingw32-gcc"
66

77
[target.i686-apple-darwin]
8-
linker = "/usr/bin/i686-linux-gnu-gcc-7"
8+
linker = "/usr/bin/i686-linux-gnu-gcc-12"
99

1010
[target.x86_64-apple-darwin]
11-
linker = "/usr/bin/x86_64-linux-gnu-gcc-7"
11+
linker = "/usr/bin/x86_64-linux-gnu-gcc-12"
1212

1313
[target.armv7-apple-ios]
14-
linker = "/usr/bin/arm-linux-gnueabihf-gcc-7"
14+
linker = "/usr/bin/arm-linux-gnueabihf-gcc-12"
1515

1616
[target.aarch64-apple-ios]
17-
linker = "/usr/bin/aarch64-linux-gnu-gcc-7"
17+
linker = "/usr/bin/aarch64-linux-gnu-gcc-12"
1818

1919
[target.i686-unknown-linux-gnu]
20-
linker = "/usr/bin/i686-linux-gnu-gcc-7"
20+
linker = "/usr/bin/i686-linux-gnu-gcc-12"
2121

2222
[target.x86_64-unknown-linux-gnu]
23-
linker = "/usr/bin/x86_64-linux-gnu-gcc-7"
23+
linker = "/usr/bin/x86_64-linux-gnu-gcc-12"
2424

2525
[target.arm-unknown-linux-gnueabihf]
26-
linker = "/usr/bin/arm-linux-gnueabihf-gcc-7"
26+
linker = "/usr/bin/arm-linux-gnueabihf-gcc-12"
2727

2828
[target.aarch64-unknown-linux-gnu]
29-
linker = "/usr/bin/aarch64-linux-gnu-gcc-7"
29+
linker = "/usr/bin/aarch64-linux-gnu-gcc-12"
3030

3131
[target.i686-linux-android]
32-
linker = "/usr/local/android-ndk-r20/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android21-clang"
32+
linker = "/usr/local/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android33-clang"
3333

3434
[target.x86_64-linux-android]
35-
linker = "/usr/local/android-ndk-r20/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang"
35+
linker = "/usr/local/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android33-clang"
3636

3737
[target.armv7-linux-androideabi]
38-
linker = "/usr/local/android-ndk-r20/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang"
38+
linker = "/usr/local/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi33-clang"
3939

4040
[target.aarch64-linux-android]
41-
linker = "/usr/local/android-ndk-r20/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang"
41+
linker = "/usr/local/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android33-clang"

‎setup/install_android_compiler_x86_64.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ if [ "${currentArch}" != "${requireArch}" ]; then
99
fi
1010

1111
cd `dirname ${0}`
12-
archiveName=android-ndk-r20b-linux-x86_64.zip
12+
archiveName=android-ndk-r26d-linux.zip
1313

14-
wget https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip?hl=ja -O $archiveName
14+
wget https://dl.google.com/android/repository/android-ndk-r26d-linux.zip?hl=ja -O $archiveName
1515
unzip $archiveName
1616
rm -f $archiveName
1717

18-
mv ./android-ndk-r20b ../libs
18+
mv ./android-ndk-r26d ../libs

‎setup/install_compiler_x86_64.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ if [ "${currentArch}" != "${requireArch}" ]; then
99
fi
1010

1111
apt-get install -y \
12-
gcc-8 \
13-
gcc-8-arm-linux-gnueabihf \
14-
gcc-8-aarch64-linux-gnu \
15-
gcc-8-i686-linux-gnu \
12+
gcc-12 \
13+
gcc-12-arm-linux-gnueabihf \
14+
gcc-12-aarch64-linux-gnu \
15+
gcc-12-i686-linux-gnu \
1616
mingw-w64

0 commit comments

Comments
 (0)