Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V3.5.2 CI Android NDK set version to 21 (#11448) #11492

Merged
merged 1 commit into from
Jun 14, 2022
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
8 changes: 7 additions & 1 deletion .github/workflows/native-bindings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@ jobs:
EXT_VERSION=`grep version native/external-config.json |awk -F'"' '{print $4}'`
git clone --branch $EXT_VERSION --depth 1 https://github.com/cocos-creator/engine-native-external native/external
rm -rf native/external/.git

- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r21e
add-to-path: false
- name: Run genbindings.py
env:
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
run: |
python3 -m pip install PyYAML==5.4.1 Cheetah3
python3 ./native/tools/tojs/genbindings.py
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/native-compile-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,14 @@ jobs:
run: |
EXT_VERSION=`grep version native/external-config.json |awk -F'"' '{print $4}'`
git clone --branch $EXT_VERSION --depth 1 https://github.com/cocos-creator/engine-native-external native/external
- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r21e
add-to-path: false
- name: Generate bindings
env:
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
run: |
python3 -m pip install PyYAML==5.4.1 Cheetah3
python3 ./native/tools/tojs/genbindings.py
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/native-compile-platforms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,15 @@ jobs:
run: |
choco install --forcex86 vulkan-sdk
python -m pip install PyYAML==5.4.1 Cheetah3
- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r21e
add-to-path: false
- name: Generate bindings
shell: bash
env:
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
run: |
python -V
cd ./native/tools/tojs
Expand Down Expand Up @@ -63,7 +70,14 @@ jobs:
run: |
EXT_VERSION=`grep version native/external-config.json |awk -F'"' '{print $4}'`
git clone --branch $EXT_VERSION --depth 1 https://github.com/cocos-creator/engine-native-external native/external
- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r21e
add-to-path: false
- name: Generate bindings
env:
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
run: |
python3 -m pip install PyYAML==5.4.1 Cheetah3
python3 ./native/tools/tojs/genbindings.py
Expand Down Expand Up @@ -123,7 +137,14 @@ jobs:
run: |
EXT_VERSION=`grep version native/external-config.json |awk -F'"' '{print $4}'`
git clone --branch $EXT_VERSION --depth 1 https://github.com/cocos-creator/engine-native-external native/external
- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r21e
add-to-path: false
- name: Generate bindings
env:
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
run: |
python -m pip install PyYAML==5.4.1 Cheetah3
python ./native/tools/tojs/genbindings.py
Expand Down Expand Up @@ -176,7 +197,14 @@ jobs:
run: |
EXT_VERSION=`grep version native/external-config.json |awk -F'"' '{print $4}'`
git clone --branch $EXT_VERSION --depth 1 https://github.com/cocos-creator/engine-native-external native/external
- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r21e
add-to-path: false
- name: Generate bindings
env:
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
run: |
python -m pip install PyYAML==5.4.1 Cheetah3
python ./native/tools/tojs/genbindings.py
Expand Down Expand Up @@ -230,7 +258,14 @@ jobs:
run: |
EXT_VERSION=`grep version native/external-config.json |awk -F'"' '{print $4}'`
git clone --branch $EXT_VERSION --depth 1 https://github.com/cocos-creator/engine-native-external native/external
- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r21e
add-to-path: false
- name: Generate bindings
env:
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
run: |
python -m pip install PyYAML==5.4.1 Cheetah3
python ./native/tools/tojs/genbindings.py
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/native-linter-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,16 @@ jobs:
run: |
EXT_VERSION=`grep version native/external-config.json |awk -F'"' '{print $4}'`
git clone --branch $EXT_VERSION --depth 1 https://github.com/cocos-creator/engine-native-external native/external

- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r21e
add-to-path: false
- name: Generate bindings
shell: bash
env:
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}

run: |
python -V
cd ./native/tools/tojs
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/native-simulator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,18 @@ jobs:
- name: install vulkan-sdk
run: |
choco install vulkan-sdk
- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r21e
add-to-path: false
- name: pip install
run: |
python -m pip install PyYAML==5.4.1 Cheetah3
- name: generate bindings glue codes
shell: bash
env:
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
run: |
python -V
cd ./tools/tojs
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/native-unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,15 @@ jobs:
npm install
npm install gulp -g
node ./utils/download-deps.js

- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r21e
add-to-path: false
- name: Generate bindings
shell: bash
env:
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
run: |
python -m pip install PyYAML==5.4.1 Cheetah3
python ./tools/tojs/genbindings.py
Expand Down