Skip to content

Commit

Permalink
I'm sick of this MacOS cross compiling BS
Browse files Browse the repository at this point in the history
  • Loading branch information
tbttfox committed Sep 13, 2024
1 parent ea9f615 commit f9e7d1c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 16 deletions.
15 changes: 3 additions & 12 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: [ubuntu-latest, windows-latest]
include:
# Add the maya update versions here
- maya: 2022
Expand All @@ -33,17 +35,6 @@ jobs:
- maya: 2025
update: 1

# cross-compiling is annoying so just fall back to macos-13
exclude:
- os: macos-latest
maya: 2022
- os: macos-latest
maya: 2023
- os: macos-13
maya: 2024
- os: macos-13
maya: 2025

fail-fast: false

runs-on: ${{ matrix.os }}
Expand Down
6 changes: 3 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
@@ -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')
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/maya/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit f9e7d1c

Please sign in to comment.