Skip to content

Commit 763301d

Browse files
IceBBBBBIceBBBBB
committed
4.0 version OHOS adaptation
Signed-off-by: 冰冰冰 <[email protected]>
1 parent e3f40a2 commit 763301d

File tree

2 files changed

+88
-88
lines changed

2 files changed

+88
-88
lines changed

‎.github/workflows/main.yml

+76-76
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,27 @@ on:
1212
workflow_dispatch:
1313

1414
jobs:
15-
ubuntu-18_04:
16-
runs-on: ubuntu-18.04
17-
steps:
18-
- uses: actions/checkout@v2
19-
with:
20-
submodules: recursive
21-
- run: python download-deps.py --r no
22-
- run: echo -e "y" | bash install-deps-linux.sh
23-
- run: cmake -B b -S .
24-
- run: cmake --build b
15+
# ubuntu-18_04:
16+
# runs-on: ubuntu-18.04
17+
# steps:
18+
# - uses: actions/checkout@v2
19+
# with:
20+
# submodules: recursive
21+
# - run: python download-deps.py --r no
22+
# - run: echo -e "y" | bash install-deps-linux.sh
23+
# - run: cmake -B b -S .
24+
# - run: cmake --build b
2525

26-
ubuntu-20_04:
27-
runs-on: ubuntu-20.04
28-
steps:
29-
- uses: actions/checkout@v2
30-
with:
31-
submodules: recursive
32-
- run: python download-deps.py --r no
33-
- run: echo -e "y" | bash install-deps-linux.sh
34-
- run: cmake -B b -S .
35-
- run: cmake --build b
26+
# ubuntu-20_04:
27+
# runs-on: ubuntu-20.04
28+
# steps:
29+
# - uses: actions/checkout@v2
30+
# with:
31+
# submodules: recursive
32+
# - run: python download-deps.py --r no
33+
# - run: echo -e "y" | bash install-deps-linux.sh
34+
# - run: cmake -B b -S .
35+
# - run: cmake --build b
3636

3737
windows-2019:
3838
runs-on: windows-2019
@@ -54,64 +54,64 @@ jobs:
5454
- run: cmake -B b -S . -G "Visual Studio 17 2022" -A Win32
5555
- run: cmake --build b
5656

57-
macos-10_15:
58-
runs-on: macos-10.15
59-
steps:
60-
- uses: actions/checkout@v2
61-
with:
62-
submodules: recursive
63-
- run: python download-deps.py --r no
64-
- run: cmake -B b -S . -GXcode
65-
- run: cmake --build b
57+
# macos-10_15:
58+
# runs-on: macos-10.15
59+
# steps:
60+
# - uses: actions/checkout@v2
61+
# with:
62+
# submodules: recursive
63+
# - run: python download-deps.py --r no
64+
# - run: cmake -B b -S . -GXcode
65+
# - run: cmake --build b
6666

67-
macos-11:
68-
runs-on: macos-11
69-
steps:
70-
- uses: actions/checkout@v2
71-
with:
72-
submodules: recursive
73-
- run: python download-deps.py --r no
74-
- run: cmake -B b -S . -GXcode
75-
- run: cmake --build b
67+
# macos-11:
68+
# runs-on: macos-11
69+
# steps:
70+
# - uses: actions/checkout@v2
71+
# with:
72+
# submodules: recursive
73+
# - run: python download-deps.py --r no
74+
# - run: cmake -B b -S . -GXcode
75+
# - run: cmake --build b
7676

77-
macos-10_15_ios:
78-
runs-on: macos-10.15
79-
steps:
80-
- uses: actions/checkout@v2
81-
with:
82-
submodules: recursive
83-
- run: python download-deps.py --r no
84-
- run: cmake -B b -S . -GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator
85-
- run: cmake --build b --config Release --target cpp-tests -- -quiet
77+
# macos-10_15_ios:
78+
# runs-on: macos-10.15
79+
# steps:
80+
# - uses: actions/checkout@v2
81+
# with:
82+
# submodules: recursive
83+
# - run: python download-deps.py --r no
84+
# - run: cmake -B b -S . -GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator
85+
# - run: cmake --build b --config Release --target cpp-tests -- -quiet
8686

87-
macos-11_ios:
88-
runs-on: macos-11
89-
steps:
90-
- uses: actions/checkout@v2
91-
with:
92-
submodules: recursive
93-
- run: python download-deps.py --r no
94-
- run: cmake -B b -S . -GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator
95-
- run: cmake --build b --config Release --target cpp-tests -- -quiet -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)"
87+
# macos-11_ios:
88+
# runs-on: macos-11
89+
# steps:
90+
# - uses: actions/checkout@v2
91+
# with:
92+
# submodules: recursive
93+
# - run: python download-deps.py --r no
94+
# - run: cmake -B b -S . -GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator
95+
# - run: cmake --build b --config Release --target cpp-tests -- -quiet -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)"
9696

97-
windows-2019-android:
98-
runs-on: windows-2019
99-
steps:
100-
- uses: actions/checkout@v2
101-
with:
102-
submodules: recursive
103-
- run: python download-deps.py --r no
104-
- run: ./gradlew assembleRelease -PPROP_BUILD_TYPE=cmake --info
105-
shell: bash
106-
working-directory: tests/cpp-tests/proj.android
97+
# windows-2019-android:
98+
# runs-on: windows-2019
99+
# steps:
100+
# - uses: actions/checkout@v2
101+
# with:
102+
# submodules: recursive
103+
# - run: python download-deps.py --r no
104+
# - run: ./gradlew assembleRelease -PPROP_BUILD_TYPE=cmake --info
105+
# shell: bash
106+
# working-directory: tests/cpp-tests/proj.android
107107

108-
ubuntu-20_04-android:
109-
runs-on: ubuntu-20.04
110-
steps:
111-
- uses: actions/checkout@v2
112-
with:
113-
submodules: recursive
114-
- run: python download-deps.py --r no
115-
- run: ./gradlew assembleRelease -PPROP_BUILD_TYPE=cmake --info
116-
shell: bash
117-
working-directory: tests/cpp-tests/proj.android
108+
# ubuntu-20_04-android:
109+
# runs-on: ubuntu-20.04
110+
# steps:
111+
# - uses: actions/checkout@v2
112+
# with:
113+
# submodules: recursive
114+
# - run: python download-deps.py --r no
115+
# - run: ./gradlew assembleRelease -PPROP_BUILD_TYPE=cmake --info
116+
# shell: bash
117+
# working-directory: tests/cpp-tests/proj.android

‎.travis.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ matrix:
2929
language: android
3030
sudo: required
3131
dist: xenial
32-
# android_lua cmake
33-
#- os: linux
34-
# env: BUILD_TARGET=android_lua_cmake
35-
# language: android
36-
# sudo: required
37-
# dist: xenial
38-
# addons:
39-
# apt:
40-
# sources:
41-
# - ubuntu-toolchain-r-test
42-
# packages:
43-
# - g++-6
32+
android_lua cmake
33+
- os: linux
34+
env: BUILD_TARGET=android_lua_cmake
35+
language: android
36+
sudo: required
37+
dist: xenial
38+
addons:
39+
apt:
40+
sources:
41+
- ubuntu-toolchain-r-test
42+
packages:
43+
- g++-6
4444
# android_js cmake
4545
# - os: linux
4646
# env: BUILD_TARGET=android_js_cmake

0 commit comments

Comments
 (0)