From 7ce700ae1e611a6841ca4f2a84ee7ee197e41b8d Mon Sep 17 00:00:00 2001
From: Lunar Starstrum <lunar@forsaken-borders.net>
Date: Tue, 10 Dec 2024 13:49:30 -0600
Subject: [PATCH] Fix Opus Android builds by not hardcoding the Android NDK
 version

---
 .github/workflows/build-commit.yml | 16 ++++++++--------
 .github/workflows/build-pr.yml     |  6 +++---
 .github/workflows/opus.yml         |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-commit.yml b/.github/workflows/build-commit.yml
index 4b37b89..520d1ac 100644
--- a/.github/workflows/build-commit.yml
+++ b/.github/workflows/build-commit.yml
@@ -23,12 +23,12 @@ jobs:
     if: "!contains(format('{0} {1}', github.event.head_commit.message, github.event.pull_request.title), '[ci-skip]')"
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
             submodules: recursive
             fetch-depth: 0
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8
       - name: Build Project
@@ -39,12 +39,12 @@ jobs:
     needs: build-commit
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
             submodules: recursive
             fetch-depth: 0
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8
       - name: Package Project
@@ -69,12 +69,12 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
             submodules: recursive
             fetch-depth: 0
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8
       - name: Build Project
@@ -83,9 +83,9 @@ jobs:
           dotnet tool update -g docfx --prerelease
           docfx docs/docfx.json
       - name: Upload GitHub Pages artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: ./docs/_site/
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
\ No newline at end of file
+        uses: actions/deploy-pages@v4
\ No newline at end of file
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index b417f61..dc9b045 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -25,11 +25,11 @@ jobs:
     if: "!contains(format('{0} {1}', github.event.head_commit.message, github.event.pull_request.title), '[ci-skip]')"
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8
       - name: Build Project
@@ -37,7 +37,7 @@ jobs:
       - name: Build and Package Project
         run: dotnet pack --include-symbols --include-source -o build -p:PR="${{ github.event.pull_request.number }}"
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: DSharpPlus.VoiceLink-PR-${{ github.event.pull_request.number }}
           path: ./build/*
\ No newline at end of file
diff --git a/.github/workflows/opus.yml b/.github/workflows/opus.yml
index 6ce9c11..a15393f 100644
--- a/.github/workflows/opus.yml
+++ b/.github/workflows/opus.yml
@@ -27,7 +27,7 @@ jobs:
           - {
             os: ubuntu-latest,
             install-deps: "sudo apt-get update && sudo apt-get -y install autoconf automake libtool gcc cmake make",
-            args: "-DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk/25.2.9519653/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a",
+            args: "-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a",
             find-file: "libopus.so",
             file: "libopus.so",
             rid: "android-arm64",