From 405111a3d344de886cd062823153af97ea59f30b Mon Sep 17 00:00:00 2001 From: Ninjalama Date: Thu, 12 Jun 2025 10:48:35 +0200 Subject: [PATCH 1/7] .github/workflows/build-android_Miron.yml aktualisiert --- .../workflows/{build-android.yml => build-android_Miron.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{build-android.yml => build-android_Miron.yml} (96%) diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android_Miron.yml similarity index 96% rename from .github/workflows/build-android.yml rename to .github/workflows/build-android_Miron.yml index db6bb9e5..85b973be 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android_Miron.yml @@ -20,7 +20,7 @@ jobs: steps: - name: 📥 Checkout code - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@v4.2.2 # v4.2.2 with: ref: ${{ github.event.pull_request.head.sha || github.sha }} show-progress: false -- 2.49.1 From 0b8642a217a4d2e40b36af274dc04ace2ce765f2 Mon Sep 17 00:00:00 2001 From: Ninjalama Date: Thu, 12 Jun 2025 11:24:33 +0200 Subject: [PATCH 2/7] .github/workflows/build-android_Miron.yml aktualisiert --- .github/workflows/build-android_Miron.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-android_Miron.yml b/.github/workflows/build-android_Miron.yml index 85b973be..1b830158 100644 --- a/.github/workflows/build-android_Miron.yml +++ b/.github/workflows/build-android_Miron.yml @@ -20,7 +20,7 @@ jobs: steps: - name: 📥 Checkout code - uses: actions/checkout@v4.2.2 # v4.2.2 + uses: actions/checkout@v4 # v4.2.2 with: ref: ${{ github.event.pull_request.head.sha || github.sha }} show-progress: false -- 2.49.1 From a00d15aa5c61af07d2cb1308e958e53e619cc07b Mon Sep 17 00:00:00 2001 From: Ninjalama Date: Thu, 12 Jun 2025 14:11:26 +0200 Subject: [PATCH 3/7] .github/workflows/build-android_Miron.yml aktualisiert --- .github/workflows/build-android_Miron.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-android_Miron.yml b/.github/workflows/build-android_Miron.yml index 1b830158..07d624ca 100644 --- a/.github/workflows/build-android_Miron.yml +++ b/.github/workflows/build-android_Miron.yml @@ -38,6 +38,10 @@ jobs: distribution: 'zulu' java-version: '17' + - name: Set up Android SDK + if: ${{ env.ACT }} # Only run on local act setups, as GitHub Actions provides the Android SDK on Ubuntu + uses: android-actions/setup-android@v2 + - name: 💾 Cache Bun dependencies uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4 with: -- 2.49.1 From eef9fe397fe609405b6bf20852ef337358eca5ab Mon Sep 17 00:00:00 2001 From: Ninjalama Date: Thu, 12 Jun 2025 14:12:07 +0200 Subject: [PATCH 4/7] .github/workflows/build-android_Miron.yml aktualisiert --- .github/workflows/build-android_Miron.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-android_Miron.yml b/.github/workflows/build-android_Miron.yml index 07d624ca..539748cc 100644 --- a/.github/workflows/build-android_Miron.yml +++ b/.github/workflows/build-android_Miron.yml @@ -39,8 +39,8 @@ jobs: java-version: '17' - name: Set up Android SDK - if: ${{ env.ACT }} # Only run on local act setups, as GitHub Actions provides the Android SDK on Ubuntu - uses: android-actions/setup-android@v2 + if: ${{ env.ACT }} # Only run on local act setups, as GitHub Actions provides the Android SDK on Ubuntu + uses: android-actions/setup-android@v2 - name: 💾 Cache Bun dependencies uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4 -- 2.49.1 From c8f8661eacc528800b63848519090e0b139c0a40 Mon Sep 17 00:00:00 2001 From: Ninjalama Date: Thu, 12 Jun 2025 14:15:00 +0200 Subject: [PATCH 5/7] .github/workflows/build-android_Miron.yml aktualisiert --- .github/workflows/build-android_Miron.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-android_Miron.yml b/.github/workflows/build-android_Miron.yml index 539748cc..d9d80248 100644 --- a/.github/workflows/build-android_Miron.yml +++ b/.github/workflows/build-android_Miron.yml @@ -7,9 +7,9 @@ concurrency: on: workflow_dispatch: pull_request: - branches: [develop, master] + branches: [develop, master,ninjalama-patch-1] push: - branches: [develop, master] + branches: [develop, master, ninjalama-patch-1] jobs: build: -- 2.49.1 From 9fcd184ad1150d4f42a3035a50102c81848126fd Mon Sep 17 00:00:00 2001 From: Ninjalama Date: Thu, 12 Jun 2025 14:16:03 +0200 Subject: [PATCH 6/7] .github/workflows/build-android_Miron.yml aktualisiert --- .github/workflows/build-android_Miron.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-android_Miron.yml b/.github/workflows/build-android_Miron.yml index d9d80248..887a85d2 100644 --- a/.github/workflows/build-android_Miron.yml +++ b/.github/workflows/build-android_Miron.yml @@ -39,8 +39,7 @@ jobs: java-version: '17' - name: Set up Android SDK - if: ${{ env.ACT }} # Only run on local act setups, as GitHub Actions provides the Android SDK on Ubuntu - uses: android-actions/setup-android@v2 + uses: android-actions/setup-android@v2 - name: 💾 Cache Bun dependencies uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4 -- 2.49.1 From ec7f99d21649b0e77eb3ba35df751c409b72feb0 Mon Sep 17 00:00:00 2001 From: Ninjalama Date: Thu, 12 Jun 2025 16:24:49 +0200 Subject: [PATCH 7/7] .github/workflows/build-android_Miron.yml aktualisiert --- .github/workflows/build-android_Miron.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-android_Miron.yml b/.github/workflows/build-android_Miron.yml index 887a85d2..40478857 100644 --- a/.github/workflows/build-android_Miron.yml +++ b/.github/workflows/build-android_Miron.yml @@ -73,7 +73,7 @@ jobs: run: echo "DATE_TAG=$(date +%d-%m-%Y_%H-%M-%S)" >> $GITHUB_ENV - name: 📤 Upload APK artifact - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 + uses: actions/upload-artifact@v3 with: name: streamyfin-apk-${{ env.DATE_TAG }} path: | -- 2.49.1