Backport Actions fixes (#894)

3 files changed, 7 insertions, 77 deletions

diff --git a/.github/workflows/branch_deploy.yml b/.github/workflows/branch_deploy.yml
deleted file mode 100644
index 46f84ce0..00000000
--- a/.github/workflows/branch_deploy.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-on:
-  push:
-    branches-ignore:
-      - master
-    paths:
-      - '.github/**'
-      - 'app/**'
-      - 'gradle/**'
-      - '*.properties'
-      - '*.gradle'
-      - 'gradlew'
-      - 'gradlew.bat'
-
-name: Build debug
-jobs:
-  generate-debug-build:
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v1
-
-    - name: Decrypt secrets
-      run: release/signing-setup.sh "$ENCRYPT_KEY"
-      env:
-        ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
-
-    - name: Copy CI gradle.properties
-      run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
-    - name: Generate cache key
-      run: ./.github/checksum.sh checksum.txt
-
-    - name: Cache gradle modules
-      uses: actions/cache@v1
-      with:
-        path: ~/.gradle/caches/modules-2
-        key: ${{ runner.os }}-gradlemodules-${{ hashFiles('checksum.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-gradlemodules-
-
-    - name: Cache gradle jars
-      uses: actions/cache@v1
-      with:
-        path: ~/.gradle/caches/jars-3
-        key: ${{ runner.os }}-gradlejars-${{ hashFiles('checksum.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-gradlejars-
-
-    - name: Cache gradle build
-      uses: actions/cache@v1
-      with:
-        path: ~/.gradle/caches/build-cache-1
-        key: ${{ runner.os }}-gradlebuildcache-${{ hashFiles('checksum.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-gradlebuildcache-
-
-    - name: Download gradle dependencies
-      run: ./gradlew dependencies
-
-    - name: Build debug app
-      run: ./gradlew :app:assembleDebug
-
-    - name: Clean secrets
-      run: release/signing-cleanup.sh
-
-    - name: Send APK to Telegram
-      run: release/deploy-telegram.sh
-      env:
-        TG_TO: ${{ secrets.TELEGRAM_TO }}
-        TG_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
-        TG_FILE: ./app/build/outputs/apk/debug/app-debug.apk
diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml
index 55086c17..e34e41bf 100644
--- a/.github/workflows/deploy_snapshot.yml
+++ b/.github/workflows/deploy_snapshot.yml
@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - master
+      - develop
 
 name: Deploy snapshot builds
 jobs:
diff --git a/.github/workflows/draft_new_release.yml b/.github/workflows/draft_new_release.yml
index f83afe61..0e91926b 100644
--- a/.github/workflows/draft_new_release.yml
+++ b/.github/workflows/draft_new_release.yml
@@ -10,13 +10,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          ref: 'release'
       - name: Extract version from milestone
         run: |
           VERSION="${{ github.event.milestone.title }}"
           echo "::set-env name=RELEASE_VERSION::$VERSION"
 
       - name: Create release branch
-        run: git checkout -b release/${{ env.RELEASE_VERSION }}
+        run: git checkout -b release-${{ env.RELEASE_VERSION }}
 
       - name: Update changelog
         uses: thomaseizinger/keep-a-changelog-new-release@1.1.0
@@ -34,12 +36,12 @@ jobs:
           git commit --message "Prepare release ${{ env.RELEASE_VERSION }}"
 
       - name: Push new branch
-        run: git push origin release/${{ env.RELEASE_VERSION }}
+        run: git push origin release-${{ env.RELEASE_VERSION }}
 
       - name: Create pull request
         uses: thomaseizinger/create-pull-request@1.0.0
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          head: release/${{ env.RELEASE_VERSION }}
-          base: master
+          head: release-${{ env.RELEASE_VERSION }}
+          base: release
           title: Release ${{ env.RELEASE_VERSION }}