Merge branch 'master' of github.com:lbl-srg/funnel

lbl-srg · Jul 17, 2024 · d40c766 · d40c766
2 parents c70c445 + 8081302
commit d40c766
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -83,7 +83,7 @@ jobs:
 
       - name: Push Linux & macOS binaries
         if: |
-          (matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest') &&
+          (contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')) &&
           contains(matrix.python-version, '3.9') &&
           github.event_name == 'push' &&
           github.ref == 'refs/heads/master'

diff --git a/pyfunnel/lib/win64/funnel.dll b/pyfunnel/lib/win64/funnel.dll
diff --git a/pyfunnel/lib/win64/funnel.lib b/pyfunnel/lib/win64/funnel.lib