Merge pull request #210 from learningequality/we_cant_have_nice_things

Actually fix release action.
learningequality · Mar 21, 2024 · 35be278 · 35be278
2 parents 3716bcf + 443dc56
commit 35be278
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/.github/workflows/build_apk.yml b/.github/workflows/build_apk.yml
@@ -25,6 +25,10 @@ on:
       tar-url:
         required: false
         type: string
+      ref:
+        description: 'A ref for this workflow to check out its own repo'
+        required: false
+        type: string
       signed:
         description: 'Should this be signed with the development key? (mutually exclusive with release)'
         required: false
@@ -71,8 +75,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       SERVICE_ACCOUNT_JSON: '${{ secrets.KOLIBRI_ANDROID_PLAY_STORE_API_SERVICE_ACCOUNT_JSON }}'
-      REPOSITORY: ${{ github.action_repository }}
-      REF: ${{ github.action_ref }}
     outputs:
       apk-file-name: ${{ steps.get-apk-filename.outputs.apk-file-name }}
       version-code: ${{ steps.get-version-code.outputs.version-code}}
@@ -88,9 +90,12 @@ jobs:
         echo "Must specify only one reference for the tar file to build the APK with."
         exit 1
     - uses: actions/checkout@v4
+      if: ${{ !inputs.ref }}
+    - uses: actions/checkout@v4
+      if: ${{ inputs.ref }}
       with:
-        repository: ${{ env.REPOSITORY }}
-        ref: ${{ env.REF }}
+        repository: learningequality/kolibri-installer-android
+        ref: ${{ inputs.ref }}
     - name: Get SHA of current commit
       id: get-commit
       # Note that we do this, so that we get the same commit regardless

diff --git a/.github/workflows/release_apk.yml b/.github/workflows/release_apk.yml
@@ -14,6 +14,10 @@ on:
         description: 'The version code to promote to the open testing track'
         required: true
         type: string
+      ref:
+        description: 'A ref for this workflow to check out its own repo'
+        required: true
+        type: string
     secrets:
       KOLIBRI_ANDROID_PLAY_STORE_API_SERVICE_ACCOUNT_JSON:
         required: false
@@ -23,13 +27,14 @@ jobs:
     runs-on: ubuntu-latest
     env:
       SERVICE_ACCOUNT_JSON: '${{ secrets.KOLIBRI_ANDROID_PLAY_STORE_API_SERVICE_ACCOUNT_JSON }}'
-      REPOSITORY: ${{ github.action_repository }}
-      REF: ${{ github.action_ref }}
     steps:
       - uses: actions/checkout@v4
+        if: ${{ !inputs.ref }}
+      - uses: actions/checkout@v4
+        if: ${{ inputs.ref }}
         with:
-          repository: ${{ env.REPOSITORY }}
-          ref: ${{ env.REF }}
+          repository: learningequality/kolibri-installer-android
+          ref: ${{ inputs.ref }}
       - name: Set up Python 3.9
         uses: actions/setup-python@v5
         with: