ci: apply overlay before installing dependencies, fix cap sync path
Some checks failed
Build / increment-version (push) Successful in 6s
Build / build-android (push) Failing after 49s
Build / create-release (push) Has been skipped

This commit is contained in:
2026-04-17 20:03:14 +10:00
parent f7b79b3e20
commit 849f4b980d
2 changed files with 10 additions and 6 deletions

View File

@@ -87,6 +87,9 @@ jobs:
- name: Install dependencies (root) - name: Install dependencies (root)
run: npm ci --prefer-offline run: npm ci --prefer-offline
- name: Apply overlay
run: npm run apply-overlay
- name: Install dependencies (cinny) - name: Install dependencies (cinny)
working-directory: ./cinny working-directory: ./cinny
run: npm ci --prefer-offline run: npm ci --prefer-offline
@@ -97,7 +100,7 @@ jobs:
- name: Make gradlew executable - name: Make gradlew executable
run: chmod +x android/gradlew run: chmod +x android/gradlew
- name: Apply overlay and build Android APK - name: Build Android APK
run: npm run android:apk:linux run: npm run android:apk:linux
- name: Upload APK - name: Upload APK

View File

@@ -6,13 +6,14 @@
"node": ">=18.0.0" "node": ">=18.0.0"
}, },
"scripts": { "scripts": {
"android:prepare": "node -e \"require('fs').copyFileSync('config.json', 'cinny/config.json')\" && cd cinny && npm run build && npx cap sync android", "apply-overlay": "node scripts/apply-overlay.mjs",
"android:prepare": "cd cinny && npm run build && cd .. && npx cap sync android",
"android:open": "cd cinny && npx cap open android", "android:open": "cd cinny && npx cap open android",
"android:run": "cd cinny && npx cap run android", "android:run": "cd cinny && npx cap run android",
"android:apk": "npm run android:prepare && cd cinny/android && gradlew.bat assembleDebug", "android:apk": "npm run apply-overlay && npm run android:prepare && cd cinny/android && gradlew.bat assembleDebug",
"android:apk:release": "npm run android:prepare && cd cinny/android && gradlew.bat assembleRelease", "android:apk:release": "npm run apply-overlay && npm run android:prepare && cd cinny/android && gradlew.bat assembleRelease",
"android:apk:linux": "npm run android:prepare && cd android && ./gradlew assembleDebug", "android:apk:linux": "cd cinny && npm run build && cd .. && npx cap sync android && cd android && ./gradlew assembleDebug",
"android:aab": "npm run android:prepare && cd cinny/android && gradlew.bat bundleRelease" "android:aab": "npm run apply-overlay && npm run android:prepare && cd cinny/android && gradlew.bat bundleRelease"
}, },
"keywords": [], "keywords": [],
"author": { "author": {