Skip to content

Commit 61a9b5b

Browse files
curtis-hhamada147
curtis-h
and
hamada147
committed
fix: ci docker (#168)
Co-authored-by: Ahmed Moussa <[email protected]> Signed-off-by: Ahmed Moussa <[email protected]> Signed-off-by: Curtis Harding <[email protected]> Signed-off-by: Ahmed Moussa <[email protected]>
1 parent 1ab88ba commit 61a9b5b

File tree

5 files changed

+133
-6
lines changed

5 files changed

+133
-6
lines changed

‎.github/workflows/pull-request.yml

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,49 @@ jobs:
6060
run: |
6161
brew install autoconf automake libtool
6262
63+
- name: "Install Mac ToolChain"
64+
if: matrix.os-type == 'macos'
65+
run: |
66+
brew tap messense/macos-cross-toolchains
67+
68+
- name: "Install Linux GNU for x86_64"
69+
if: matrix.os-type == 'macos'
70+
run: |
71+
rm '/usr/local/bin/2to3'
72+
rm '/usr/local/bin/2to3-3.11'
73+
rm '/usr/local/bin/2to3-3.12'
74+
rm '/usr/local/bin/python3'
75+
rm '/usr/local/bin/python3.11'
76+
rm '/usr/local/bin/python3.12'
77+
rm '/usr/local/bin/idle3'
78+
rm '/usr/local/bin/idle3.11'
79+
rm '/usr/local/bin/idle3.12'
80+
rm '/usr/local/bin/pydoc3'
81+
rm '/usr/local/bin/pydoc3.11'
82+
rm '/usr/local/bin/pydoc3.12'
83+
rm '/usr/local/bin/python3-config'
84+
rm '/usr/local/bin/python3.11-config'
85+
rm '/usr/local/bin/python3.12-config'
86+
rm -r '/usr/local/lib/node_modules'
87+
brew install --overwrite x86_64-unknown-linux-gnu
88+
89+
- name: "Install Linux GNU for aarch64"
90+
if: matrix.os-type == 'macos'
91+
run: |
92+
brew install --overwrite aarch64-unknown-linux-gnu
93+
94+
- name: "Install Rust Targets"
95+
if: matrix.os-type == 'macos'
96+
run: |
97+
rustup target add armv7-linux-androideabi
98+
rustup target add i686-linux-android
99+
rustup target add aarch64-linux-android
100+
rustup target add x86_64-linux-android
101+
rustup target add aarch64-apple-darwin
102+
rustup target add x86_64-apple-darwin
103+
rustup target add aarch64-unknown-linux-gnu
104+
rustup target add x86_64-unknown-linux-gnu
105+
63106
- uses: maxim-lobanov/setup-xcode@v1
64107
if: matrix.os-type == 'macos'
65108
with:
@@ -75,7 +118,7 @@ jobs:
75118

76119
- name: "Install wasm-pack"
77120
run: cargo install wasm-pack
78-
121+
79122
- name: "Test Kotlin code is properly formatted"
80123
run: ./gradlew ktlintCheck
81124

‎.github/workflows/release-documentation.yml

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
~/.gradle/caches
3939
~/.gradle/wrapper
4040
~/.konan
41-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
41+
key: "${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}"
4242
restore-keys: |
4343
${{ runner.os }}-gradle-
4444
@@ -60,6 +60,46 @@ jobs:
6060
if: matrix.os-type == 'linux'
6161
run: sudo apt install rustc build-essential -y
6262

63+
- name: "Install Mac ToolChain"
64+
run: |
65+
brew tap messense/macos-cross-toolchains
66+
67+
- name: "Install Linux GNU for x86_64"
68+
run: |
69+
rm '/usr/local/bin/2to3'
70+
rm '/usr/local/bin/2to3-3.11'
71+
rm '/usr/local/bin/2to3-3.12'
72+
rm '/usr/local/bin/python3'
73+
rm '/usr/local/bin/python3.11'
74+
rm '/usr/local/bin/python3.12'
75+
rm '/usr/local/bin/idle3'
76+
rm '/usr/local/bin/idle3.11'
77+
rm '/usr/local/bin/idle3.12'
78+
rm '/usr/local/bin/pydoc3'
79+
rm '/usr/local/bin/pydoc3.11'
80+
rm '/usr/local/bin/pydoc3.12'
81+
rm '/usr/local/bin/python3-config'
82+
rm '/usr/local/bin/python3.11-config'
83+
rm '/usr/local/bin/python3.12-config'
84+
rm -r '/usr/local/lib/node_modules'
85+
brew install --overwrite x86_64-unknown-linux-gnu
86+
87+
- name: "Install Linux GNU for aarch64"
88+
run: |
89+
brew install --overwrite aarch64-unknown-linux-gnu
90+
91+
- name: "Install Rust Targets"
92+
run: |
93+
rustup target add armv7-linux-androideabi
94+
rustup target add i686-linux-android
95+
rustup target add aarch64-linux-android
96+
rustup target add x86_64-linux-android
97+
rustup target add aarch64-apple-darwin
98+
rustup target add x86_64-apple-darwin
99+
rustup target add aarch64-unknown-linux-gnu
100+
rustup target add x86_64-unknown-linux-gnu
101+
102+
63103
- name: "Install rust toolchain (Macos)"
64104
if: matrix.os-type == 'macos'
65105
run: brew install rustup

‎.github/workflows/release.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,45 @@ jobs:
4848
run: |
4949
brew install autoconf automake libtool
5050
51+
- name: "Install Mac ToolChain"
52+
run: |
53+
brew tap messense/macos-cross-toolchains
54+
55+
- name: "Install Linux GNU for x86_64"
56+
run: |
57+
rm '/usr/local/bin/2to3'
58+
rm '/usr/local/bin/2to3-3.11'
59+
rm '/usr/local/bin/2to3-3.12'
60+
rm '/usr/local/bin/python3'
61+
rm '/usr/local/bin/python3.11'
62+
rm '/usr/local/bin/python3.12'
63+
rm '/usr/local/bin/idle3'
64+
rm '/usr/local/bin/idle3.11'
65+
rm '/usr/local/bin/idle3.12'
66+
rm '/usr/local/bin/pydoc3'
67+
rm '/usr/local/bin/pydoc3.11'
68+
rm '/usr/local/bin/pydoc3.12'
69+
rm '/usr/local/bin/python3-config'
70+
rm '/usr/local/bin/python3.11-config'
71+
rm '/usr/local/bin/python3.12-config'
72+
rm -r '/usr/local/lib/node_modules'
73+
brew install --overwrite x86_64-unknown-linux-gnu
74+
75+
- name: "Install Linux GNU for aarch64"
76+
run: |
77+
brew install --overwrite aarch64-unknown-linux-gnu
78+
79+
- name: "Install Rust Targets"
80+
run: |
81+
rustup target add armv7-linux-androideabi
82+
rustup target add i686-linux-android
83+
rustup target add aarch64-linux-android
84+
rustup target add x86_64-linux-android
85+
rustup target add aarch64-apple-darwin
86+
rustup target add x86_64-apple-darwin
87+
rustup target add aarch64-unknown-linux-gnu
88+
rustup target add x86_64-unknown-linux-gnu
89+
5190
- uses: maxim-lobanov/setup-xcode@v1
5291
with:
5392
xcode-version: '15.0.1'

‎apollo/build.gradle.kts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ kotlin {
533533
implementation("org.kotlincrypto.macs:hmac-sha2:0.3.0")
534534
implementation("org.kotlincrypto.hash:sha2:0.4.0")
535535
implementation("com.squareup.okio:okio:3.7.0")
536-
implementation("org.jetbrains.kotlinx:atomicfu:0.23.1")
536+
implementation("org.jetbrains.kotlinx:atomicfu:0.23.2")
537537
}
538538
}
539539
val commonTest by getting {
@@ -646,6 +646,7 @@ kotlin {
646646
.resolve("kotlin")
647647
)
648648
}
649+
applyDefaultHierarchyTemplate()
649650

650651
all {
651652
languageSettings {
@@ -846,8 +847,12 @@ afterEvaluate {
846847
tasks.withType<KtLintCheckTask> {
847848
// dependsOn(buildEd25519Bip32Task)
848849
}
849-
tasks.getByName("androidDebugSourcesJar").dependsOn(copyEd25519Bip32GeneratedTask)
850-
tasks.getByName("androidReleaseSourcesJar").dependsOn(copyEd25519Bip32GeneratedTask)
850+
tasks.withType<org.gradle.jvm.tasks.Jar> {
851+
dependsOn(copyEd25519Bip32GeneratedTask)
852+
}
853+
854+
tasks.getByName("androidDebugSourcesJar").dependsOn(copyToAndroidSrc)
855+
tasks.getByName("androidReleaseSourcesJar").dependsOn(copyToAndroidSrc)
851856

852857
tasks.getByName("mergeDebugJniLibFolders").dependsOn(buildEd25519Bip32Task)
853858
tasks.getByName("mergeReleaseJniLibFolders").dependsOn(buildEd25519Bip32Task)

‎rust-ed25519-bip32

0 commit comments

Comments
 (0)