Minus changes

DHD2280 · Oct 13, 2024 · daf8c73 · daf8c73
1 parent f279fcc
commit daf8c73
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 36 deletions.
diff --git a/.github/bumpVersion.sh b/.github/bumpVersion.sh
@@ -14,13 +14,5 @@ sed -i 's/"apkUrl":.*/"apkUrl": "https:\/\/github.com\/DHD2280\/Oxygen-Customize
 echo "**$NEWVERNAME**  " > newChangeLog.md
 cat changeLog.md >> newChangeLog.md
 echo "  " >> newChangeLog.md
-cat BetaChangelog.md >> newChangeLog.md
-mv  newChangeLog.md BetaChangelog.md
-
-echo "*$NEWVERNAME* released in beta channel  " > telegram.msg
-echo "  " >> telegram.msg
-echo "*Changelog:*  " >> telegram.msg
-cat changeLog.md >> telegram.msg
-echo 'TMessage<<EOF' >> $GITHUB_ENV
-cat telegram.msg >> $GITHUB_ENV
-echo 'EOF' >> $GITHUB_ENV
+cat Changelog.md >> newChangeLog.md
+mv  newChangeLog.md Changelog.md
diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml
@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Source Code Download
-        run: git clone --branch stable --single-branch --recurse-submodules https://github.com/DHD2280/Oxygen-Customizer-AI-Plugin.git .
+        run: git clone --branch main --single-branch --recurse-submodules https://github.com/DHD2280/Oxygen-Customizer-AI-Plugin.git .
 
       - name: Setup JDK 17
         uses: actions/setup-java@v4.1.0
@@ -44,7 +44,7 @@ jobs:
       - name: Upload Zip
         uses: actions/upload-artifact@v4.3.1
         with:
-          name: OxygenCustomizer
+          name: OxygenCustomizerAIPlugin
           path: app/build/outputs/apk/release/*.apk
 
       - name: Release the binaries
@@ -61,28 +61,9 @@ jobs:
         uses: github-actions-x/commit@v2.9
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          push-branch: 'stable'
+          push-branch: 'main'
           commit-message: 'Version update: Release'
           force-add: 'true'
-          files: app/build.gradle.kts latestStable.json StableChangelog.md
+          files: app/build.gradle.kts latestVersion.json Changelog.md
           name: GitHub
-          email: OxygenCustomizer@dhd.it
-
-      - name: Telegram Channel Post
-        uses: appleboy/telegram-action@master
-        with:
-          to: ${{ secrets.OC_CHANNEL }}
-          token: ${{ secrets.TELEGRAM_TK }}
-          message: ${{ env.TMessage }}
-          format: markdown
-
-      - name: Zip artifact for deployment
-        run: cd ./app/build/outputs/apk/release/ && zip OxygenCustomizer.zip *.apk -r
-
-      - name: Telegram File Attachment
-        if: github.repository == 'DHD2280/Oxygen-Customizer'
-        run: |
-          curl -v "https://api.telegram.org/bot${{ secrets.TELEGRAM_TK }}/sendMediaGroup" \
-              -F chat_id=${{ secrets.OC_CHANNEL }} \
-              -F media='[{"type":"document", "media":"attach://Xposed", "caption":"Oxygen Customizer ${{ github.ref }}"}]' \
-              -F Xposed="@app/build/outputs/apk/release/OxygenCustomizer.zip"
+          email: OxygenCustomizerAIPlugin@dhd.it
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -16,8 +16,7 @@ android {
         targetSdk = 34
         versionCode = 1
         versionName = "1.0"
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        setProperty("archivesBaseName", "OxygenCustomizerAIPlugin.apk")
     }
 
     val keystorePropertiesFile = rootProject.file("keystore.properties")