Skip to content

Commit ed8009a

Browse files
committed
Fix conveyor CI signing
1 parent 8089411 commit ed8009a

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

.github/workflows/validate.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ concurrency:
1111

1212
jobs:
1313
build:
14-
name: Build
14+
name: Build Mobile
1515
runs-on: macos-latest
1616

1717
strategy:
@@ -43,26 +43,18 @@ jobs:
4343
name: ${{ matrix.organization }}-${{ matrix.type }}-APKs
4444
path: composeApp/build/outputs/apk/**/**/composeApp-*.apk
4545

46-
desktop-build:
47-
name: Desktop Build
46+
build-desktop:
47+
name: Build Desktop
4848
runs-on: macos-latest
49-
needs: [ build ]
5049

5150
steps:
5251
- uses: actions/checkout@v4
5352

5453
- name: Setup
5554
uses: ./.github/actions/setup
5655

57-
- name: Copy branding resources
58-
run: ./gradlew copyBrandingToCommonResources
59-
60-
- name: Run Conveyor (make app)
61-
uses: hydraulic-software/conveyor/actions/build@v9.1
62-
with:
63-
command: make app
64-
signing_key: ${{ secrets.SIGNING_KEY }}
65-
agree_to_license: 1
56+
- name: Package Desktop app
57+
run: ./gradlew copyBrandingToCommonResources packageDistributionForCurrentOS
6658

6759
android-lint:
6860
name: Android Lint
@@ -91,7 +83,6 @@ jobs:
9183
kotlin-lint:
9284
name: Kotlin Lint
9385
runs-on: macos-latest
94-
needs: [ build ]
9586

9687
steps:
9788
- uses: actions/checkout@v4

conveyor.conf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
include "#!./gradlew -q composeApp:printConveyorConfig"
22

3+
// This enables native library extraction, which improves app startup time and robustness.
4+
// It's optional but a good idea to have it. You can remove this if you get tired of specifying
5+
// system properties for Java libraries with native components.
6+
//
7+
// See https://hydraulic.dev/blog/11-in-jar-signing.html for more.
8+
include required("https://raw.githubusercontent.com/hydraulic-software/conveyor/master/configs/jvm/extract-native-libraries.conf")
9+
310
// Config file documentation: https://conveyor.hydraulic.dev/latest/configs
411
app {
512
vcs-url = "github.com/ooni/probe-multiplatform"

0 commit comments

Comments
 (0)