Skip to content

Commit

Permalink
fix: Fix publish workflow (#528)
Browse files Browse the repository at this point in the history
Fix android and macos builds and bump gradle and java version
  • Loading branch information
Foxushka authored Nov 23, 2024
1 parent 24c21ad commit e35a13a
Show file tree
Hide file tree
Showing 8 changed files with 200 additions and 179 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
java-version: '21'
- uses: subosito/flutter-action@v2
with:
channel: 'stable'
Expand Down
58 changes: 4 additions & 54 deletions .github/workflows/publish-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
java-version: '21'
- name: Load Secret
uses: mobiledevops/secret-to-file-action@v1
with:
Expand Down Expand Up @@ -102,8 +102,8 @@ jobs:
working-directory: "./chameleonultragui"
run: |
export APP_STORE_CONNECT_PRIVATE_KEY=`cat AuthKey.p8`
app-store-connect fetch-signing-files run.chameleon.gui --platform MAC_OS --type MAC_APP_STORE --certificate-key=@file:cert_key --create
app-store-connect list-certificates --type MAC_INSTALLER_DISTRIBUTION --certificate-key=@file:cert_key --save
app-store-connect fetch-signing-files run.chameleon.gui --platform MAC_OS --type MAC_APP_STORE --certificate-key=@file:cert_key --create
app-store-connect certificates list --type DISTRIBUTION --certificate-key=@file:cert_key --save
keychain initialize
keychain add-certificates
xcode-project use-profiles
Expand All @@ -123,7 +123,7 @@ jobs:
INSTALLER_CERT_NAME=$(keychain list-certificates \
| jq '[.[]
| select(.common_name
| contains("Mac Developer Installer"))
| contains("Apple Distribution"))
| .common_name][0]' \
| xargs)
xcrun productsign --sign "$INSTALLER_CERT_NAME" unsigned.pkg "$PACKAGE_NAME"
Expand Down Expand Up @@ -216,53 +216,3 @@ jobs:
export APP_STORE_CONNECT_PRIVATE_KEY=`cat AuthKey.p8`
app-store-connect builds submit-to-testflight $BUILD_ID || true
app-store-connect beta-groups add-build $BUILD_ID --beta-group="Open beta testing" || true
# Skip automatically pushing to AUR...
#build-aur:
# runs-on: ubuntu-latest
# defaults:
# run:
# working-directory: ./chameleonultragui
# steps:
# - uses: actions/checkout@v3
# with:
# fetch-depth: 100
# - uses: webfactory/[email protected]
# with:
# ssh-private-key: ${{ secrets.AUR_KEY }}
# - name: configure ssh
# run: |
# mkdir -p ~/.ssh
# ssh-keyscan -t rsa aur.archlinux.org >> ~/.ssh/known_hosts
# echo -e "Host aur.archlinux.org\n\tStrictHostKeyChecking no\n\tUser aur" >> ~/.ssh/config
# - name: configure git
# run: |
# git config --global user.email "github-actions[bot]@users.noreply.github.com"
# git config --global user.name "github-actions[bot]"
# - run: cp ../release-PKGBUILD PKGBUILD
# working-directory: "./chameleonultragui/"
# - run: cp ../release-.SRCINFO .SRCINFO
# working-directory: "./chameleonultragui/"
# - name: Update pakagerel in PKGBUILD
# run: sed -i "s/pkgrel=.*/pkgrel=${{ github.run_number }}/" PKGBUILD
# working-directory: "./chameleonultragui/"
# - name: Update pkgrel in .SRCINFO
# run: sed -i "s/pkgrel = .*/pkgrel = ${{ github.run_number }}/" .SRCINFO
# working-directory: "./chameleonultragui/"
# - name: clone aur
# run: git -c init.defaultbranch=master clone ssh://[email protected]/chameleonultragui.git
# working-directory: "./chameleonultragui/"
# - name: copy PKGBUILD
# run: cp ../PKGBUILD ./
# working-directory: "./chameleonultragui/chameleonultragui/"
# - name: copy .SRCINFO
# run: cp ../.SRCINFO ./
# working-directory: "./chameleonultragui/chameleonultragui/"
# - name: commit
# run: |
# git add PKGBUILD
# git add .SRCINFO
# git commit -m "Update to ${{ github.run_number }}"
# working-directory: "./chameleonultragui/chameleonultragui/"
# - name: push
# run: git push
# working-directory: "./chameleonultragui/chameleonultragui/"
21 changes: 9 additions & 12 deletions chameleonultragui/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if (keystorePropertiesFile.exists()) {
android {
namespace = "io.chameleon.ultra"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion
ndkVersion = "27.0.12077973"

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
Expand All @@ -26,10 +26,7 @@ android {
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId = "io.chameleon.ultra"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode
Expand All @@ -47,14 +44,14 @@ android {

buildTypes {
release {
if (keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']).exists() : false) {
println "Info: upload-keystore.jks found. Signing for release."
signingConfig signingConfigs.release
}
else {
println "Warning: upload-keystore.jks not found. Signing for debug."
signingConfig signingConfigs.debug
}
if (keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']).exists() : false) {
println "Info: upload-keystore.jks found. Signing for release."
signingConfig = signingConfigs.release
}
else {
println "Warning: upload-keystore.jks not found. Signing for debug."
signingConfig = signingConfigs.debug
}
}
}

Expand Down
1 change: 1 addition & 0 deletions chameleonultragui/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
android.enableJetifier=true
android.ndk.suppressMinSdkVersionError=21
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
2 changes: 1 addition & 1 deletion chameleonultragui/android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "com.android.application" version "8.7.0" apply false
id "org.jetbrains.kotlin.android" version "2.0.21" apply false
}

Expand Down
Loading

0 comments on commit e35a13a

Please sign in to comment.