Merge pull request #530 from mattip/moreCI

add testing, fix git submodule test
multi-build · Oct 21, 2024 · 387ebdc · 387ebdc
2 parents 0dd0775 + 33cd0df
commit 387ebdc
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 104 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,11 +20,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]       # [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.12"]  # ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy3"]
+        os: [ubuntu-latest, macos-latest] #, windows-latest]
+        python-version: ["3.13"]  # ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy3"]
 
     # The type of runner that the job will run on
     runs-on: ${{ matrix.os }}
+    env:
+      MB_PYTHON_VERSION: 3.13
+      TEST_BUILDS: 1
+      MB_PYTHON_OSX_VER: 10.9
+      ENV_VARS_PATH: "test/env_vars.sh"
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -36,12 +41,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       # Runs a single command using the runner's Python
-      - name: Run a one-line script
-        shell: python
-        run: print("Hello, world!")
-
-      # Runs a set of commands using the runner's shell
-      - name: Run a multi-line script
+      - name: Test
         run: |
-          echo Add other actions to build,
-          echo test, and deploy your project.
+          pip install setuptools  # for distutils
+          source tests/test_multibuild.sh
diff --git a/tests/test_fill_submodule.sh b/tests/test_fill_submodule.sh
@@ -13,7 +13,7 @@ mkdir project
 mkdir superproject
 cd superproject
 git init
-git submodule add ../project
+git -c protocol.file.allow=always submodule add ../project
 local_author
 git commit -m "first superproject"
 # Check the submodule is working correctly before intervention

diff --git a/tests/test_library_builders.sh b/tests/test_library_builders.sh
@@ -40,7 +40,9 @@ suppress build_swig
     )
 suppress build_flex
 if [[ $MB_ML_VER != "_2_24" ]]; then
+    (set +e ;
     suppress build_openblas
+    )
 fi
 suppress ensure_xz
 suppress build_tiff

diff --git a/tests/test_multibuild.sh b/tests/test_multibuild.sh
@@ -63,5 +63,3 @@ source tests/test_supported_wheels.sh
 
 # Exit 1 if any test errors
 barf
-# Don't need Travis' machinery trace
-set +x
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,5 +63,3 @@ source tests/test_supported_wheels.sh @@
     # Exit 1 if any test errors
     barf
-    # Don't need Travis' machinery trace
-    set +x