adding linux matrix using new docker containers

mottosso · Apr 6, 2022 · f83bdf9 · f83bdf9
1 parent fa1be6c
commit f83bdf9
Showing 1 changed file with 25 additions and 42 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -25,10 +25,12 @@ jobs:
 
       matrix:
        include:
-         - maya: "2020"
-           devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2020/Autodesk_Maya_2020_4_Update_DEVKIT_Windows.zip"
-         - maya: "2022"
-           devkit: "https://autodesk-adn-transfer.s3.us-west-2.amazonaws.com/ADN%20Extranet/M%26E/Maya/devkit%202022/Autodesk_Maya_2022_DEVKIT_Windows.zip"
+          - maya: "2020"
+            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2020/Autodesk_Maya_2020_4_Update_DEVKIT_Windows.zip"
+          - maya: "2022"
+            devkit: "https://autodesk-adn-transfer.s3.us-west-2.amazonaws.com/ADN%20Extranet/M%26E/Maya/devkit%202022/Autodesk_Maya_2022_DEVKIT_Windows.zip"
+          - maya: "2023"
+            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2023/Autodesk_Maya_2023_DEVKIT_Windows.zip"
 
     steps:
       - name: Checkout code
@@ -63,10 +65,12 @@ jobs:
 
       matrix:
        include:
-         - maya: "2020"
-           devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2020/Autodesk_Maya_2020_4_Update_DEVKIT_Mac.dmg"
-         - maya: "2022"
-           devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2022/Autodesk_Maya_2022_3_Update_DEVKIT_Mac.dmg"
+          - maya: "2020"
+            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2020/Autodesk_Maya_2020_4_Update_DEVKIT_Mac.dmg"
+          - maya: "2022"
+            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2022/Autodesk_Maya_2022_3_Update_DEVKIT_Mac.dmg"
+          - maya: "2023"
+            devkit: "https://autodesk-adn-transfer.s3-us-west-2.amazonaws.com/ADN+Extranet/M%26E/Maya/devkit+2023/Autodesk_Maya_2023_DEVKIT_Mac.dmg"
 
     steps:
       - name: Checkout code
@@ -98,7 +102,16 @@ jobs:
 
   maya-linux:
     runs-on: ubuntu-latest
-    container: scottenglert/maya-build:2020
+    container: scottenglert/maya-build:${{matrix.maya}}
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+       include:
+          - maya: "2020"
+          - maya: "2022"
+          - maya: "2023"
 
     steps:
       - name: Checkout code
@@ -108,43 +121,13 @@ jobs:
 
       - name: Configure CMake
         run: |
-          cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DMAYA_VERSION=2020 -DMAYA_DEVKIT_ROOT="/usr/autodesk/devkitBase"
+          cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DMAYA_VERSION=${{matrix.maya}} -DMAYA_DEVKIT_ROOT="/usr/autodesk/devkitBase"
 
       - name: Build
         run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
       - name: Artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: linux-2020
-          path: build/cmdc.so
-
-    # strategy:
-    #   fail-fast: false
-
-
-
-  # build-linux:
-  #   # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
-  #   # You can convert this to a matrix build if you need cross-platform coverage.
-  #   # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #   - uses: actions/checkout@v3
-
-  #   - name: Configure CMake
-  #     # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-  #     # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-  #     run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-
-  #   - name: Build
-  #     # Build your program with the given configuration
-  #     run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-
-  #   - name: Test
-  #     working-directory: ${{github.workspace}}/build
-  #     # Execute tests defined by the CMake configuration.  
-  #     # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-  #     run: ctest -C ${{env.BUILD_TYPE}}
-
+          name: linux-${{matrix.maya}}
+          path: build/${{env.BUILD_TYPE}}/cmdc.so