fix github actions

Neboer · Mar 11, 2023 · 28d13f2 · 28d13f2
1 parent 73c5a1c
commit 28d13f2
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,6 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
-<<<<<<< HEAD
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
@@ -28,17 +27,6 @@ jobs:
       - name: Assemble Fdroid release apk
         run: ./gradlew :vector-app:assembleFdroidRelease $CI_GRADLE_ARG_PROPERTIES
       - name: Upload Fdroid release APKs
-=======
-          # https://github.com/actions/checkout/issues/881
-          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
-      - name: Configure gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
-      - name: Assemble GPlay unsigned apk
-        run: ./gradlew clean assembleGplayRelease $CI_GRADLE_ARG_PROPERTIES
-      - name: Upload Gplay unsigned APKs
->>>>>>> element/main
         uses: actions/upload-artifact@v3
         with:
           name: vector-Fdroid-release