Make it work on github

blurstudio · Sep 13, 2024 · be4c0c5 · be4c0c5
1 parent fc8cd90
commit be4c0c5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,8 +20,10 @@ jobs:
   compile_plugin:
     strategy:
       matrix:
+        # Sorry MacOS, The switch to ARM is maiking this too complicated
+        # If somebody wants to get it working, PR's welcome
         maya: [2022, 2023, 2024, 2025]
-        os: [macos-13, macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-13, ubuntu-latest, windows-latest]
         include: 
           # Add the maya update versions here
           - maya: 2022
@@ -33,12 +35,8 @@ jobs:
           - maya: 2025
             update: 1
 
-        # cross-compiling is annoying so just fall back to macos-13
+        # cross-compiling is annoying so just skip the newer maya versions
         exclude: 
-          - os: macos-latest
-            maya: 2022
-          - os: macos-latest
-            maya: 2023
           - os: macos-13
             maya: 2024
           - os: macos-13
@@ -68,19 +66,22 @@ jobs:
             -Dpython_build=false
             --buildtype release
             --backend ninja
+          install-args: --skip-subprojects
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: ${{ runner.os }}-${{ matrix.maya }}-plugin
-          path: build/*.${{ steps.get-devkit.outputs.plugin-ext }}
+          path: output_Maya${{ matrix.maya }}/*.${{ steps.get-devkit.outputs.plugin-ext }}
           if-no-files-found: error
 
 
   compile_python:
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        # Sorry MacOS, The switch to ARM is maiking this too complicated
+        # If somebody wants to get it working, PR's welcome
+        os: [macos-13, ubuntu-latest, windows-latest]
 
       fail-fast: false
 
@@ -102,12 +103,13 @@ jobs:
             -Dpython_build=true
             --buildtype release
             --backend ninja
+          install-args: --skip-subprojects
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: ${{ runner.os }}-pyModule
-          path: build/*.*
+          path: output_Python/*.*
           if-no-files-found: error
 
   upload_release:

diff --git a/meson.build b/meson.build
@@ -1,8 +1,5 @@
 project('Simplex', 'cpp', default_options: ['cpp_std=c++20'])
 
-maya_dep = dependency('maya')
-maya_name_suffix = maya_dep.get_variable('name_suffix')
-maya_version = maya_dep.get_variable('maya_version')
 
 maya_build = get_option('maya_build')
 python_build = get_option('python_build')
@@ -13,6 +10,9 @@ endif
 
 subdir('src/simplexlib')
 if maya_build
+  maya_dep = dependency('maya')
+  maya_name_suffix = maya_dep.get_variable('name_suffix')
+  maya_version = maya_dep.get_variable('maya_version')
   subdir('src/maya')
 endif
 

diff --git a/src/maya/meson.build b/src/maya/meson.build
@@ -14,7 +14,7 @@ if fs.is_file('src/version.h')
 else
   git = find_program('git', native: true, required: true)
   version_h = vcs_tag(
-    command: [git, 'describe', '--tags', '--match', 'v[0-9]*', '--dirty=+'],
+    command: [git, 'describe', '--tags', '--always', '--match', 'v[0-9]*', '--dirty=+'],
     fallback: 'v0.0.1',
     input: 'src/version.h.in',
     output: 'version.h',