update some workflows

DatL4g · Jul 11, 2024 · d87eeff · d87eeff
1 parent c9dbbc4
commit d87eeff
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 34 deletions.
diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
@@ -21,31 +21,34 @@ jobs:
 
       - name: Create Sekrets
         run: |
-          ./gradlew createSekretProperties -Pkey=MONGO_APPLICATION -Pvalue=${{ secrets.MONGO_APPLICATION }};
-          ./gradlew createSekretProperties -Pkey=WRAP_API -Pvalue=${{ secrets.WRAP_API }};
+          ./gradlew createSekretProperties -Pkey=GITHUB_CLIENT_ID -Pvalue=${{ secrets.GITHUB_CLIENT_ID }};
+          ./gradlew createSekretProperties -Pkey=GITHUB_CLIENT_SECRET -Pvalue=${{ secrets.GITHUB_CLIENT_SECRET }};
           ./gradlew createSekretProperties -Pkey=FIREBASE_PROJECT -Pvalue=${{ secrets.FIREBASE_PROJECT }};
           ./gradlew createSekretProperties -Pkey=FIREBASE_APPLICATION -Pvalue=${{ secrets.FIREBASE_APPLICATION }};
           ./gradlew createSekretProperties -Pkey=FIREBASE_API_KEY -Pvalue=${{ secrets.FIREBASE_API_KEY }}
 
-      - name: Create native library
-        run: ./gradlew app:shared:createNativeLib
+      - name: Generate Sekret binary
+        run: ./gradlew composeApp:createSekretNativeBinary
+
+      - name: Copy Sekrets
+        run: ./gradlew composeApp:copySekretNativeBinary
 
       - name: Execute Build
-        run: ./gradlew app:android:assembleRelease && ./gradlew app:android:bundleRelease
+        run: ./gradlew composeApp:assembleRelease && ./gradlew composeApp:bundleRelease
 
       - name: Move APK file(s)
-        run: mv ./app/android/build/outputs/apk/release/*.apk ./app/android/release/
+        run: mv ./composeApp/build/outputs/apk/release/*.apk ./composeApp/release/
 
       - name: Move AAB file(s)
-        run: mv ./app/android/build/outputs/bundle/release/*.aab ./app/android/release/
+        run: mv ./composeApp/build/outputs/bundle/release/*.aab ./composeApp/release/
 
       - name: Remove "-unsigned" from filename(s)
-        run: for filename in ./app/android/release/*-unsigned*; do mv "./$filename" "./$(echo "$filename" | sed -e 's/-unsigned//g')";  done
+        run: for filename in ./composeApp/release/*-unsigned*; do mv "./$filename" "./$(echo "$filename" | sed -e 's/-unsigned//g')";  done
 
       - uses: ilharp/sign-android-release@v1
         id: sign_app
         with:
-          releaseDir: app/android/release
+          releaseDir: composeApp/release
           signingKey: ${{ secrets.ANDROID_SIGNING_KEY }}
           keyAlias: ${{ secrets.ANDROID_KEY_ALIAS }}
           keyStorePassword: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}

diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
@@ -21,22 +21,25 @@ jobs:
 
       - name: Create Sekrets
         run: |
-          ./gradlew createSekretProperties -Pkey=MONGO_APPLICATION -Pvalue=${{ secrets.MONGO_APPLICATION }};
-          ./gradlew createSekretProperties -Pkey=WRAP_API -Pvalue=${{ secrets.WRAP_API }};
+          ./gradlew createSekretProperties -Pkey=GITHUB_CLIENT_ID -Pvalue=${{ secrets.GITHUB_CLIENT_ID }};
+          ./gradlew createSekretProperties -Pkey=GITHUB_CLIENT_SECRET -Pvalue=${{ secrets.GITHUB_CLIENT_SECRET }};
           ./gradlew createSekretProperties -Pkey=FIREBASE_PROJECT -Pvalue=${{ secrets.FIREBASE_PROJECT }};
           ./gradlew createSekretProperties -Pkey=FIREBASE_APPLICATION -Pvalue=${{ secrets.FIREBASE_APPLICATION }};
           ./gradlew createSekretProperties -Pkey=FIREBASE_API_KEY -Pvalue=${{ secrets.FIREBASE_API_KEY }}
 
-      - name: Create native library
-        run: ./gradlew app:shared:createNativeLib
+      - name: Generate Sekret binary
+        run: ./gradlew composeApp:createSekretNativeBinary
+
+      - name: Copy Sekrets
+        run: ./gradlew composeApp:copySekretNativeBinary
 
       - name: Package
-        run: ./gradlew app:desktop:packageDmg; ./gradlew app:desktop:packageUberJarForCurrentOS
+        run: ./gradlew composeApp:packageDmg; ./gradlew composeApp:packageUberJarForCurrentOS
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
           path: |
             build/release/main/dmg/*.dmg
-            app/desktop/build/compose/jars/Burning-Series-*.jar
+            composeApp/build/compose/jars/Burning-Series-*.jar
           retention-days: 1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,17 +27,20 @@ jobs:
 
       - name: Create Sekrets
         run: |
-          ./gradlew createSekretProperties -Pkey=MONGO_APPLICATION -Pvalue=${{ secrets.MONGO_APPLICATION }};
-          ./gradlew createSekretProperties -Pkey=WRAP_API -Pvalue=${{ secrets.WRAP_API }};
+          ./gradlew createSekretProperties -Pkey=GITHUB_CLIENT_ID -Pvalue=${{ secrets.GITHUB_CLIENT_ID }};
+          ./gradlew createSekretProperties -Pkey=GITHUB_CLIENT_SECRET -Pvalue=${{ secrets.GITHUB_CLIENT_SECRET }};
           ./gradlew createSekretProperties -Pkey=FIREBASE_PROJECT -Pvalue=${{ secrets.FIREBASE_PROJECT }};
           ./gradlew createSekretProperties -Pkey=FIREBASE_APPLICATION -Pvalue=${{ secrets.FIREBASE_APPLICATION }};
           ./gradlew createSekretProperties -Pkey=FIREBASE_API_KEY -Pvalue=${{ secrets.FIREBASE_API_KEY }}
 
-      - name: Create native library
-        run: ./gradlew app:shared:createNativeLib
+      - name: Generate Sekret binary
+        run: ./gradlew composeApp:createSekretNativeBinary
+
+      - name: Copy Sekrets
+        run: ./gradlew composeApp:copySekretNativeBinary
 
       - name: Create package on Ubuntu
-        run: ./gradlew app:desktop:packageDeb; ./gradlew app:desktop:packageAppImage; ./gradlew app:desktop:packageUberJarForCurrentOS
+        run: ./gradlew composeApp:packageDeb; ./gradlew composeApp:packageAppImage; ./gradlew composeApp:packageUberJarForCurrentOS
 
       - name: Create Browser Extensions on Ubuntu
         continue-on-error: true
@@ -51,7 +54,7 @@ jobs:
           curl --request GET --url https://github.com/AppImage/AppImageKit/releases/download/continuous/AppRun-x86_64 --location --output ./build/release/main/image/Burning-Series/AppRun
           chmod +x ./build/release/main/image/appimagetool.AppImage
           chmod +x ./build/release/main/image/Burning-Series/AppRun
-          cp ./app/desktop/Burning-Series.desktop ./build/release/main/image/Burning-Series/
+          cp ./composeApp/Burning-Series.desktop ./build/release/main/image/Burning-Series/
           cp ./build/release/main/app/Burning-Series/lib/Burning-Series.png ./build/release/main/image/Burning-Series/
           cp -r ./build/release/main/app/Burning-Series/bin ./build/release/main/image/Burning-Series/usr/
           cp -r ./build/release/main/app/Burning-Series/lib ./build/release/main/image/Burning-Series/usr/
@@ -67,7 +70,7 @@ jobs:
             ./build/release/main/deb/*.deb
             ./build/release/main/extension/*.zip
             ./build/release/main/extension/*.xpi
-            ./app/desktop/build/compose/jars/Burning-Series-*.jar
+            ./composeApp/build/compose/jars/Burning-Series-*.jar
 
   release-windows:
     runs-on: windows-latest
@@ -86,19 +89,23 @@ jobs:
 
       - name: Create Sekrets
         run: |
-          gradle createSekretProperties -Pkey=MONGO_APPLICATION -Pvalue=${{ secrets.MONGO_APPLICATION }};
-          gradle createSekretProperties -Pkey=WRAP_API -Pvalue=${{ secrets.WRAP_API }};
+          gradle createSekretProperties -Pkey=GITHUB_CLIENT_ID -Pvalue=${{ secrets.GITHUB_CLIENT_ID }};
+          gradle createSekretProperties -Pkey=GITHUB_CLIENT_SECRET -Pvalue=${{ secrets.GITHUB_CLIENT_SECRET }};
           gradle createSekretProperties -Pkey=FIREBASE_PROJECT -Pvalue=${{ secrets.FIREBASE_PROJECT }};
           gradle createSekretProperties -Pkey=FIREBASE_APPLICATION -Pvalue=${{ secrets.FIREBASE_APPLICATION }};
           gradle createSekretProperties -Pkey=FIREBASE_API_KEY -Pvalue=${{ secrets.FIREBASE_API_KEY }}
         working-directory: ${{ github.workspace }}
 
-      - name: Create native library
-        run: gradle app:shared:createNativeLib
+      - name: Generate Sekret binary
+        run: gradle composeApp:createSekretNativeBinary
+        working-directory: ${{ github.workspace }}
+
+      - name: Copy Sekrets
+        run: gradle composeApp:copySekretNativeBinary
         working-directory: ${{ github.workspace }}
 
       - name: Package
-        run: gradle app:desktop:packageExe; gradle app:desktop:packageMsi; gradle app:desktop:packageUberJarForCurrentOS
+        run: gradle composeApp:packageExe; gradle composeApp:packageMsi; gradle composeApp:packageUberJarForCurrentOS
         working-directory: ${{ github.workspace }}
 
       - name: Upload release packages
@@ -107,7 +114,7 @@ jobs:
           files: |
             build/release/main/exe/*.exe
             build/release/main/msi/*.msi
-            app/desktop/build/compose/jars/Burning-Series-*.jar
+            composeApp/build/compose/jars/Burning-Series-*.jar
 
   release-mac:
     runs-on: macos-latest

diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
@@ -21,19 +21,23 @@ jobs:
 
       - name: Create Sekrets
         run: |
-          gradle createSekretProperties -Pkey=MONGO_APPLICATION -Pvalue=${{ secrets.MONGO_APPLICATION }};
-          gradle createSekretProperties -Pkey=WRAP_API -Pvalue=${{ secrets.WRAP_API }};
+          gradle createSekretProperties -Pkey=GITHUB_CLIENT_ID -Pvalue=${{ secrets.GITHUB_CLIENT_ID }};
+          gradle createSekretProperties -Pkey=GITHUB_CLIENT_SECRET -Pvalue=${{ secrets.GITHUB_CLIENT_SECRET }};
           gradle createSekretProperties -Pkey=FIREBASE_PROJECT -Pvalue=${{ secrets.FIREBASE_PROJECT }};
           gradle createSekretProperties -Pkey=FIREBASE_APPLICATION -Pvalue=${{ secrets.FIREBASE_APPLICATION }};
           gradle createSekretProperties -Pkey=FIREBASE_API_KEY -Pvalue=${{ secrets.FIREBASE_API_KEY }}
         working-directory: ${{ github.workspace }}
 
-      - name: Create native library
-        run: gradle app:shared:createNativeLib
+      - name: Generate Sekret binary
+        run: gradle composeApp:createSekretNativeBinary
+        working-directory: ${{ github.workspace }}
+
+      - name: Copy Sekrets
+        run: gradle composeApp:copySekretNativeBinary
         working-directory: ${{ github.workspace }}
 
       - name: Package
-        run: gradle app:desktop:packageExe; gradle app:desktop:packageMsi; gradle app:desktop:packageUberJarForCurrentOS
+        run: gradle composeApp:packageExe; gradle composeApp:packageMsi; gradle composeApp:packageUberJarForCurrentOS
         working-directory: ${{ github.workspace }}
 
       - name: Upload artifact
@@ -42,5 +46,5 @@ jobs:
           path: |
             build/release/main/exe/*.exe
             build/release/main/msi/*.msi
-            app/desktop/build/compose/jars/Burning-Series-*.jar
+            composeApp/build/compose/jars/Burning-Series-*.jar
           retention-days: 1