From e6f6417a46fafdbe80a8d3fc37a74a18999aa254 Mon Sep 17 00:00:00 2001
From: opacam <canellestudi@gmail.com>
Date: Wed, 4 Dec 2019 01:08:00 +0100
Subject: [PATCH 1/2] [gh-actions] Add testapp for `armeabi-v7a` and create
 artifacts

---
 .github/workflows/push.yml | 12 ++++++++++--
 Makefile                   | 11 +++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 254832ceaf..e2cf04db5a 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -45,15 +45,23 @@ jobs:
     name: Build testapp
     needs: [flake8]
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        build-arch: ['arm64-v8a', 'armeabi-v7a']
     steps:
     - name: Checkout python-for-android
       uses: actions/checkout@master
     - name: Pull docker image
       run: |
         make docker/pull
-    - name: Build apk for Python 3 arm64-v8a
+    - name: Build apk for Python 3 ${{ matrix.build-arch }}
       run: |
-        make docker/run/make/testapps/python3/arm64-v8a
+        mkdir -p apks
+        make docker/run/make/with-artifact/testapps/python3/${{ matrix.build-arch }}
+    - uses: actions/upload-artifact@v1
+      with:
+        name: bdisttest_python3_sqlite_openssl_googlendk__${{ matrix.build-arch }}-debug-1.1.apk
+        path: apks
 
   rebuild_updated_recipes:
     name: Test updated recipes
diff --git a/Makefile b/Makefile
index 9483eb71af..aac0e51c71 100644
--- a/Makefile
+++ b/Makefile
@@ -76,5 +76,16 @@ docker/run/command: docker/build
 docker/run/make/%: docker/build
 	docker run --rm --env-file=.env $(DOCKER_IMAGE) make $*
 
+docker/run/make/with-artifact/%: docker/build
+ifeq (,$(findstring python3,$($*)))
+	$(eval $@_APP_NAME := bdisttest_python3_sqlite_openssl_googlendk)
+else
+	$(eval $@_APP_NAME := bdisttest_python2_sqlite_openssl)
+endif
+	$(eval $@_APP_ARCH := $(shell basename $*))
+	docker run --name p4a-latest --env-file=.env $(DOCKER_IMAGE) make $*
+	docker cp p4a-latest:/home/user/app/testapps/$($@_APP_NAME)__$($@_APP_ARCH)-debug-1.1-.apk ./apks
+	docker rm -fv p4a-latest
+
 docker/run/shell: docker/build
 	docker run --rm --env-file=.env -it $(DOCKER_IMAGE)

From 72c2fe52ca1195c22d7e96e9ed7458217ed50dc0 Mon Sep 17 00:00:00 2001
From: opacam <canellestudi@gmail.com>
Date: Wed, 4 Dec 2019 12:22:51 +0100
Subject: [PATCH 2/2] [gh-actions] Pin actions/checkout to v1

---
 .github/workflows/push.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index e2cf04db5a..48ef9133ca 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout python-for-android
-      uses: actions/checkout@master
+      uses: actions/checkout@v1
     - name: Set up Python 3.7
       uses: actions/setup-python@v1.1.0
       with:
@@ -30,7 +30,7 @@ jobs:
         os: [ubuntu-latest, macOs-latest]
     steps:
     - name: Checkout python-for-android
-      uses: actions/checkout@master
+      uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1.1.0
       with:
@@ -50,7 +50,7 @@ jobs:
         build-arch: ['arm64-v8a', 'armeabi-v7a']
     steps:
     - name: Checkout python-for-android
-      uses: actions/checkout@master
+      uses: actions/checkout@v1
     - name: Pull docker image
       run: |
         make docker/pull
@@ -69,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout python-for-android
-      uses: actions/checkout@master
+      uses: actions/checkout@v1
     - name: Pull docker image
       run: |
         make docker/pull