浏览代码

CI - remove makefile support for macOS platform.

Yao Wei Tjong 姚伟忠 5 年之前
父节点
当前提交
c383c12dfe
共有 2 个文件被更改,包括 5 次插入30 次删除
  1. 4 27
      .github/workflows/main.yml
  2. 1 3
      rakefile

+ 4 - 27
.github/workflows/main.yml

@@ -161,8 +161,7 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - macOS-xcode
-          - macOS-make
+          - macOS
         lib-type:
           - static
           - shared
@@ -178,36 +177,14 @@ jobs:
         uses: actions/checkout@v2
         with: { fetch-depth: 0 }
       - name: Install dependencies
-        run: |
-          while ! brew install doxygen graphviz; do sleep 1; done
-          if [[ $PLATFORM == macOS-make ]]; then
-            while ! brew install ccache; do sleep 1; done
-            brew info ccache |grep -o '\S*lib\S*' >>$GITHUB_PATH
-            echo USE_CCACHE=1 >>$GITHUB_ENV
-          fi
-      - name: Install headers
-        run: sudo cp -rp $(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/* /usr/local/include
-        if: matrix.platform == 'macOS-make'
-      - name: Source checksum
-        id: source_checksum
-        run: rake source_checksum
-        if: matrix.platform == 'macOS-make'
-      - name: Cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.ccache
-          key: |
-            ${{ matrix.platform }}-${{ matrix.lib-type }}-${{ steps.source_checksum.outputs.hexdigest }}
-          restore-keys: |
-            ${{ matrix.platform }}-${{ matrix.lib-type }}
-        if: matrix.platform == 'macOS-make'
+        run: while ! brew install doxygen graphviz; do sleep 1; done
       - name: CMake
         run: rake cmake
       - name: Build
         run: rake build
       - name: Test
         run: rake test
-        if: startsWith(matrix.platform, 'macOS')
+        if: matrix.platform == 'macOS'
       - name: Documentation
         run: rake doc
       - name: Scaffolding - install
@@ -222,7 +199,7 @@ jobs:
         run: |
           cd ~/projects/UrhoApp
           rake test
-        if: startsWith(matrix.platform, 'macOS')
+        if: matrix.platform == 'macOS'
       - name: Scaffolding - cleanup
         run: rm -rf ~/{stage,projects}
       - name: Package

+ 1 - 3
rakefile

@@ -158,9 +158,7 @@ task :ci do
   end
   case ENV['HOST']
   when 'macOS'
-    ENV['GENERATOR'] = ENV['URHO3D_DEPLOYMENT_TARGET'] = 'generic' if ENV['MODIFIER'] == 'make'
-    ENV['BUILD_PARAMS'] = '-sdk iphonesimulator' if ENV['PLATFORM'] == 'iOS'
-    ENV['BUILD_PARAMS'] = '-sdk appletvsimulator' if ENV['PLATFORM'] == 'tvOS'
+    # Do nothing
   when 'windows'
     if ENV['MODIFIER'] == 'gcc'
       ENV['URHO3D_DEPLOYMENT_TARGET'] = 'generic'