From 9f8fd43e60a94909115d7242c9d594a82d080034 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Mon, 4 Oct 2021 14:11:41 +0530
Subject: [PATCH] github: revert Debian deployment changes

---
 .github/ci-gradle.properties | 18 ++++++++----------
 .github/workflows/ci.yml     | 11 +++--------
 scripts/deploy-snapshot.sh   |  3 +--
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.github/ci-gradle.properties b/.github/ci-gradle.properties
index d0df7bfc..a92f0076 100644
--- a/.github/ci-gradle.properties
+++ b/.github/ci-gradle.properties
@@ -1,11 +1,9 @@
 org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 \
-                   --illegal-access=permit
-#                   --add-opens java.base/java.io=ALL-UNNAMED \
-#                   --add-opens jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
-#                   --add-opens jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
-#                   --add-opens jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
-#                   --add-opens jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED  \
-#                   --add-opens jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
-#                   --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
-#                   --add-opens jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
-#                   --add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+                   --add-opens jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
+                   --add-opens jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+                   --add-opens jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
+                   --add-opens jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED  \
+                   --add-opens jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
+                   --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
+                   --add-opens jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+                   --add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b4226d5e..ee788b1c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,11 +60,11 @@ jobs:
     needs: [ "run-unit-tests", "stylecheck" ]
     steps:
 
-      - name: Setup Java 16
+      - name: Setup Java 11
         uses: actions/setup-java@d9126d7df2f1b080b603441eaf5810ced3614e78
         with:
           distribution: 'zulu'
-          java-version: '16'
+          java-version: '11'
 
       - name: Checkout repository
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
@@ -77,16 +77,11 @@ jobs:
         env:
           ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
 
-      - name: Build Android release
+      - name: Build release app
         uses: burrunan/gradle-cache-action@03c71a8ba93d670980695505f48f49daf43704a6
         with:
           arguments: :android:assembleRelease
 
-      - name: Build Debian package
-        uses: burrunan/gradle-cache-action@03c71a8ba93d670980695505f48f49daf43704a6
-        with:
-          arguments: :desktop:packageDeb
-
       - name: Clean secrets
         run: scripts/signing-cleanup.sh
 
diff --git a/scripts/deploy-snapshot.sh b/scripts/deploy-snapshot.sh
index 5789282b..10f55e20 100755
--- a/scripts/deploy-snapshot.sh
+++ b/scripts/deploy-snapshot.sh
@@ -8,7 +8,6 @@ mkdir -p "$SSHDIR"
 echo "$ACTIONS_DEPLOY_KEY" > "$SSHDIR/key"
 chmod 600 "$SSHDIR/key"
 mkdir -p "$GITHUB_WORKSPACE/Claw"
-find . -type f -name '*.apk' -exec cp {} "$GITHUB_WORKSPACE/Claw/Claw.apk" \;
-find . -type f -name '*.deb' -exec cp {} "$GITHUB_WORKSPACE/Claw/" \;
+cp -v ./android/build/outputs/apk/release/android-release.apk "$GITHUB_WORKSPACE/Claw/Claw.apk"
 cd "$GITHUB_WORKSPACE/Claw"
 rsync -ahvcr --omit-dir-times --progress --delete --no-o --no-g -e "ssh -i $SSHDIR/key -o StrictHostKeyChecking=no -p $SSH_PORT" . "$SERVER_DEPLOY_STRING"