From 56c52bba6d9b6d7964e88f2db6efe84b90d72b7c Mon Sep 17 00:00:00 2001
From: Adam Velebil <adam.velebil@yubico.com>
Date: Mon, 4 Apr 2022 17:39:01 +0200
Subject: [PATCH] fix android action

---
 .github/workflows/android.yaml | 67 +++-------------------------------
 1 file changed, 6 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml
index e61936ca..44fbdcf9 100644
--- a/.github/workflows/android.yaml
+++ b/.github/workflows/android.yaml
@@ -3,67 +3,7 @@ name: Android
 on: [push, pull_request]
 
 jobs:
-  build-debug:
-    name: Debug apk
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout Yubikit Next
-        uses: actions/checkout@v2
-        with:
-          repository: Yubico/yubikit-android
-          ref: next
-          path: kit
-
-      - name: set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-
-      - name: Build Yubikit-android
-        run: ./gradlew --stacktrace check test build javadocJar publishToMavenLocal
-        working-directory: ./kit
-
-      - name: Install Flutter
-        uses: subosito/flutter-action@v1
-        with:
-          channel: 'beta'
-      - run: |
-          flutter config
-          flutter --version
-
-      - uses: actions/checkout@v2
-        with:
-          path: 'app'
-
-      - name: Run flutter tests
-        run: |
-          flutter test
-          flutter analyze
-        working-directory: ./app
-
-      - name: Build the App
-        run: flutter build apk --debug
-        working-directory: ./app
-
-      - name: Run android tests
-        run: |
-          ./gradlew test
-        working-directory: ./app/android
-
-      - name: Upload artifacts
-        run: |
-          export REF=$(echo ${GITHUB_REF} | cut -d '/' -f 3,4,5,6,7 | sed -r 's/\//_/g')
-          mkdir artifacts
-          mv build/app/outputs/flutter-apk/app-debug.apk artifacts/yubico-authenticator-debug-${REF}.apk
-        working-directory: ./app
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: yubico-authenticator-android
-          path: app/artifacts/*
-
-  build-release:
+  build-debug build-release:
     name: Release apk
     runs-on: ubuntu-latest
 
@@ -114,6 +54,11 @@ jobs:
       - name: Run android tests
         run: |
           ./gradlew test
+        env:
+          YUBIOATH_STORE_BASE64: ${{ secrets.YUBIOATH_STORE_BASE64 }}
+          YUBIOATH_KEY_ALIAS: ${{ secrets.YUBIOATH_KEY_ALIAS }}
+          YUBIOATH_KEY_PASSWORD: ${{ secrets.YUBIOATH_KEY_PASSWORD }}
+          YUBIOATH_STORE_PASSWORD: ${{ secrets.YUBIOATH_STORE_PASSWORD }}
         working-directory: ./app/android
 
       - name: Upload artifacts