Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
variant: [base, full]
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
submodules: recursive

Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
cp /tmp/jni-win-x64/libopus_jni.dll desktop-native-libs/windows/x86_64/

- name: Upload Desktop Native Artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: desktop-native-libs-${{ matrix.variant }}
path: desktop-native-libs/
Expand All @@ -169,18 +169,18 @@ jobs:
variant: [base, full]
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
submodules: recursive

- name: Setup Java
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '17'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v5

- name: Fetch git tags for version detection
run: |
Expand All @@ -193,7 +193,7 @@ jobs:
git describe --tags --match 'v*' || echo "Git describe failed"

- name: Download Desktop Native Libraries
uses: actions/download-artifact@v4
uses: actions/download-artifact@v7
with:
name: desktop-native-libs-${{ matrix.variant }}
path: kopus/build/jni_docker/
Expand Down Expand Up @@ -226,7 +226,7 @@ jobs:

- name: Upload Test Results
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: jvm-test-results-${{ matrix.variant }}
path: |
Expand Down Expand Up @@ -257,7 +257,7 @@ jobs:
tar -czf /tmp/kopus-maven-artifacts${{ steps.config.outputs.artifact_suffix }}.tar.gz eu/buney/

- name: Upload Maven Artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: kopus-maven-artifacts-${{ matrix.variant }}
path: /tmp/kopus-maven-artifacts${{ steps.config.outputs.artifact_suffix }}.tar.gz
Expand Down
7 changes: 6 additions & 1 deletion scripts/build_opus_android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ for i in "${!ABIS[@]}"; do
else
PLATFORM="$OS-$(uname -m)"
fi
CC_PATH="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/$PLATFORM/bin/${HOST}${API}-clang"
TOOLBIN="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/$PLATFORM/bin"
CC_PATH="$TOOLBIN/${HOST}${API}-clang"

OUT_DIR="$OUT_ROOT/$ABI"
mkdir -p "$OUT_DIR"
Expand All @@ -55,6 +56,10 @@ for i in "${!ABIS[@]}"; do
--enable-static \
--host="$HOST" \
CC="$CC_PATH" \
AR="$TOOLBIN/llvm-ar" \
RANLIB="$TOOLBIN/llvm-ranlib" \
STRIP="$TOOLBIN/llvm-strip" \
NM="$TOOLBIN/llvm-nm" \
CFLAGS="-Oz" \
--prefix="$OUT_DIR" \
$EXTRA_CONFIGURE_FLAGS
Expand Down
Loading