Hacks to get release builds

kaidokert · Apr 8, 2024 · 5081602 · 5081602
1 parent a99c34e
commit 5081602
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.github/actions/docker/action.yaml b/.github/actions/docker/action.yaml
@@ -16,7 +16,7 @@ runs:
       shell: bash
     - name: Get docker file changes
       id: changed-files
-      uses: tj-actions/changed-files@8953e851a137075e59e84b5c15fbeb3617e82f15 # v32.1.1
+      uses: kaidokert/changed-files@c684f86a9764f2533437c51cf25ff325d6986755 # extra logging
       with:
         files_ignore: third_party/**
         files: |
@@ -38,7 +38,7 @@ runs:
         set -x
         docker_tag="${{ steps.meta.outputs.tags }}"
         docker_tag="${docker_tag%.1[+,-]}"
-        echo "DOCKER_TAG=${docker_tag}" >> $GITHUB_ENV
+        echo "DOCKER_TAG=${docker_tag}" | head -n 1 >> $GITHUB_ENV
       shell: bash
     # We need to set docker tag properly for pull requests.  In those scenarios where no docker related files
     # were changed we need to use an existing image (e.g. main).  In cases where docker image is rebuilt we have

diff --git a/.github/actions/docker_win/action.yaml b/.github/actions/docker_win/action.yaml
@@ -12,7 +12,7 @@ runs:
       shell: bash
     - name: Get docker file changes
       id: changed-files
-      uses: tj-actions/changed-files@8953e851a137075e59e84b5c15fbeb3617e82f15 # v32.1.1
+      uses: kaidokert/changed-files@c684f86a9764f2533437c51cf25ff325d6986755 # extra logging
       with:
         files_ignore: third_party/**
         files: |
@@ -33,7 +33,7 @@ runs:
         set -x
         docker_tag="${{ steps.meta.outputs.tags }}"
         docker_tag="${docker_tag%.1[+,-]}"
-        echo "DOCKER_TAG=${docker_tag}" >> $GITHUB_ENV
+        echo "DOCKER_TAG=${docker_tag}" | head -n 1 >> $GITHUB_ENV
       shell: bash
     # We need to set docker tag properly for pull requests.  In those scenarios where no docker related files
     # were changed we need to use an existing image (e.g. main).  In cases where docker image is rebuilt we have

diff --git a/.github/workflows/android_24.lts.1+.yaml b/.github/workflows/android_24.lts.1+.yaml
@@ -94,3 +94,11 @@ jobs:
           retention-days: 90
           compression-level: 0 # We expect kept artifacts to be already compressed
           if-no-files-found: error
+      - name: Upload the APKs to a release
+        if: ${{ github.event_name == 'release' }}
+        uses: skx/github-action-publish-binaries@b9ca5643b2f1d7371a6cba7f35333f1461bbc703 # release-2.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: |
+            .
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -149,7 +149,7 @@ jobs:
         id: set-docker-tag-output
         run: |
           echo $DOCKER_TAG
-          echo "docker_tag=$DOCKER_TAG"  >> $GITHUB_ENV
+          echo "docker_tag=$DOCKER_TAG" | head -n 1  >> $GITHUB_ENV
     outputs:
       docker_tag: ${{env.docker_tag}}