ohos code rollback

.appveyor.yml

@@ -8,9 +8,9 @@ environment:
   PYTHON_VERSION: "2.7.13"
   PYTHON_ARCH: "32"
   matrix:
-    - build_type: windows32_cmake_test
-    - build_type: android_cpp_tests
-    - build_type: android_lua_tests
+#    - build_type: windows32_cmake_test
+ #   - build_type: android_cpp_tests
+ #   - build_type: android_lua_tests
 #    - build_type: android_cocos_new_test
 #    - build_type: android_cpp_empty_test
 #    - build_type: android_gen_libs

.github/workflows/main.yml

@@ -12,27 +12,27 @@ on:
   workflow_dispatch:
 
 jobs:
-  ubuntu-18_04:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-        with:
-            submodules: recursive
-      - run: python download-deps.py --r no
-      - run: echo -e "y" | bash install-deps-linux.sh
-      - run: cmake -B b -S .
-      - run: cmake --build b
+  # ubuntu-18_04:
+  #   runs-on: ubuntu-18.04
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #       with:
+  #           submodules: recursive
+  #     - run: python download-deps.py --r no
+  #     - run: echo -e "y" | bash install-deps-linux.sh
+  #     - run: cmake -B b -S .
+  #     - run: cmake --build b
 
-  ubuntu-20_04:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-        with:
-            submodules: recursive
-      - run: python download-deps.py --r no
-      - run: echo -e "y" | bash install-deps-linux.sh
-      - run: cmake -B b -S .
-      - run: cmake --build b
+  # ubuntu-20_04:
+  #   runs-on: ubuntu-20.04
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #       with:
+  #           submodules: recursive
+  #     - run: python download-deps.py --r no
+  #     - run: echo -e "y" | bash install-deps-linux.sh
+  #     - run: cmake -B b -S .
+  #     - run: cmake --build b
 
   windows-2019:
     runs-on: windows-2019
@@ -54,64 +54,64 @@ jobs:
       - run: cmake -B b -S . -G "Visual Studio 17 2022" -A Win32
       - run: cmake --build b
 
-  macos-10_15:
-    runs-on: macos-10.15
-    steps:
-      - uses: actions/checkout@v2
-        with:
-            submodules: recursive
-      - run: python download-deps.py --r no
-      - run: cmake -B b -S . -GXcode
-      - run: cmake --build b
+  # macos-10_15:
+  #   runs-on: macos-10.15
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #       with:
+  #           submodules: recursive
+  #     - run: python download-deps.py --r no
+  #     - run: cmake -B b -S . -GXcode
+  #     - run: cmake --build b
 
-  macos-11:
-    runs-on: macos-11
-    steps:
-      - uses: actions/checkout@v2
-        with:
-            submodules: recursive
-      - run: python download-deps.py --r no
-      - run: cmake -B b -S . -GXcode
-      - run: cmake --build b 
+  # macos-11:
+  #   runs-on: macos-11
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #       with:
+  #           submodules: recursive
+  #     - run: python download-deps.py --r no
+  #     - run: cmake -B b -S . -GXcode
+  #     - run: cmake --build b 
 
-  macos-10_15_ios:
-    runs-on: macos-10.15
-    steps:
-      - uses: actions/checkout@v2
-        with:
-            submodules: recursive
-      - run: python download-deps.py --r no
-      - run: cmake -B b -S . -GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator
-      - run: cmake --build b --config Release --target cpp-tests -- -quiet
+  # macos-10_15_ios:
+  #   runs-on: macos-10.15
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #       with:
+  #           submodules: recursive
+  #     - run: python download-deps.py --r no
+  #     - run: cmake -B b -S . -GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator
+  #     - run: cmake --build b --config Release --target cpp-tests -- -quiet
 
-  macos-11_ios:
-    runs-on: macos-11
-    steps:
-      - uses: actions/checkout@v2
-        with:
-            submodules: recursive
-      - run: python download-deps.py --r no
-      - run: cmake -B b -S . -GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator
-      - run: cmake --build b --config Release --target cpp-tests -- -quiet -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)"
+  # macos-11_ios:
+  #   runs-on: macos-11
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #       with:
+  #           submodules: recursive
+  #     - run: python download-deps.py --r no
+  #     - run: cmake -B b -S . -GXcode -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator
+  #     - run: cmake --build b --config Release --target cpp-tests -- -quiet -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)"
 
-  windows-2019-android:
-    runs-on: windows-2019
-    steps:
-      - uses: actions/checkout@v2
-        with:
-            submodules: recursive
-      - run: python download-deps.py --r no
-      - run: ./gradlew assembleRelease -PPROP_BUILD_TYPE=cmake --info
-        shell: bash
-        working-directory: tests/cpp-tests/proj.android
+  # windows-2019-android:
+  #   runs-on: windows-2019
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #       with:
+  #           submodules: recursive
+  #     - run: python download-deps.py --r no
+  #     - run: ./gradlew assembleRelease -PPROP_BUILD_TYPE=cmake --info
+  #       shell: bash
+  #       working-directory: tests/cpp-tests/proj.android
 
-  ubuntu-20_04-android:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-        with:
-            submodules: recursive
-      - run: python download-deps.py --r no
-      - run: ./gradlew assembleRelease -PPROP_BUILD_TYPE=cmake --info
-        shell: bash
-        working-directory: tests/cpp-tests/proj.android
+  # ubuntu-20_04-android:
+  #   runs-on: ubuntu-20.04
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #       with:
+  #           submodules: recursive
+  #     - run: python download-deps.py --r no
+  #     - run: ./gradlew assembleRelease -PPROP_BUILD_TYPE=cmake --info
+  #       shell: bash
+  #       working-directory: tests/cpp-tests/proj.android

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "tools/cocos2d-console"]
         path = tools/cocos2d-console
-        url = git://github.com/cocos2d/cocos2d-console.git
+        url = https://github.com/cocos2d/cocos2d-console.git
 [submodule "tools/bindings-generator"]
         path = tools/bindings-generator
-        url = git://github.com/cocos2d/bindings-generator.git
+        url = https://github.com/cocos2d/bindings-generator.git
 [submodule "tests/cpp-tests/Resources/ccs-res"]
         path = tests/cpp-tests/Resources/ccs-res
-        url = git://github.com/dumganhar/ccs-res.git
+        url = https://github.com/dumganhar/ccs-res.git

cocos/renderer/CMakeLists.txt

@@ -132,4 +132,4 @@ list(APPEND COCOS_RENDERER_SRC
     renderer/backend/metal/DeviceInfoMTL.mm
 )
 
-endif()
+endif()

docs/CODING_STYLE.md

@@ -2453,7 +2453,7 @@ if (condition) {
 }
 ```
 
-## Loops and Switch Statement
+## Loops and Switch Statements
 
 Switch statements may use braces for blocks. Annotate non-trivial fall-through between cases. Empty loop bodies should use {} or continue.
 

tests/lua-tests/src/NewAudioEngineTest/NewAudioEngineTest.lua

@@ -524,4 +524,4 @@ function AudioEngineTest()
     scene:addChild(AudioControlTest.create())
     scene:addChild(CreateBackMenuItem())
     return scene
-end
+end