From 9c52b2e3987d7f715edc2a13c0412942efc021f4 Mon Sep 17 00:00:00 2001 From: Sebastian Blauth Date: Tue, 27 Jun 2023 13:00:02 +0200 Subject: [PATCH 1/4] Update micromamba setup in CI --- .github/workflows/test_demos.yml | 8 ++++---- .github/workflows/tests_macos.yml | 4 ++-- .github/workflows/tests_parallel.yml | 4 ++-- .github/workflows/tests_serial.yml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test_demos.yml b/.github/workflows/test_demos.yml index f6ee6e36..a9a1aad4 100644 --- a/.github/workflows/test_demos.yml +++ b/.github/workflows/test_demos.yml @@ -20,10 +20,10 @@ jobs: uses: actions/checkout@v3.5.3 - name: Install micromamba - uses: mamba-org/provision-with-micromamba@main + uses: mamba-org/setup-micromamba@v1 with: environment-file: .github/micromamba/testenv.yml - extra-specs: | + create-args: >- fenics=2019 meshio">=5.0.0" pytest">=7.0.0" @@ -58,10 +58,10 @@ jobs: uses: actions/checkout@v3.5.3 - name: Install micromamba - uses: mamba-org/provision-with-micromamba@main + uses: mamba-org/setup-micromamba@v1 with: environment-file: .github/micromamba/testenv.yml - extra-specs: | + create-args: >- fenics=2019 meshio">=5.0.0" pytest">=7.0.0" diff --git a/.github/workflows/tests_macos.yml b/.github/workflows/tests_macos.yml index 9e69a88c..98c5c221 100644 --- a/.github/workflows/tests_macos.yml +++ b/.github/workflows/tests_macos.yml @@ -23,10 +23,10 @@ jobs: uses: actions/checkout@v3.5.3 - name: Install micromamba - uses: mamba-org/provision-with-micromamba@main + uses: mamba-org/setup-micromamba@v1 with: environment-file: .github/micromamba/testenv.yml - extra-specs: | + create-args: >- python=${{ matrix.python-version }} fenics=2019 meshio">=5.0.0" diff --git a/.github/workflows/tests_parallel.yml b/.github/workflows/tests_parallel.yml index bbc59727..ee578802 100644 --- a/.github/workflows/tests_parallel.yml +++ b/.github/workflows/tests_parallel.yml @@ -27,10 +27,10 @@ jobs: uses: actions/checkout@v3.5.3 - name: Install micromamba - uses: mamba-org/provision-with-micromamba@main + uses: mamba-org/setup-micromamba@v1 with: environment-file: .github/micromamba/testenv.yml - extra-specs: | + create-args: >- fenics=2019 meshio">=5.0.0" pytest">=7.0.0" diff --git a/.github/workflows/tests_serial.yml b/.github/workflows/tests_serial.yml index da6c000f..79828899 100644 --- a/.github/workflows/tests_serial.yml +++ b/.github/workflows/tests_serial.yml @@ -24,10 +24,10 @@ jobs: uses: actions/checkout@v3.5.3 - name: Install micromamba - uses: mamba-org/provision-with-micromamba@main + uses: mamba-org/setup-micromamba@v1 with: environment-file: .github/micromamba/testenv.yml - extra-specs: | + create-args: >- fenics=2019 meshio">=5.0.0" pytest">=7.0.0" From 0ec443dd81d4942348465613163ab0744d59f22b Mon Sep 17 00:00:00 2001 From: Sebastian Blauth Date: Wed, 28 Jun 2023 11:28:47 +0200 Subject: [PATCH 2/4] Try different syntax for mamba actions --- .github/workflows/tests_serial.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/tests_serial.yml b/.github/workflows/tests_serial.yml index 79828899..95c5b182 100644 --- a/.github/workflows/tests_serial.yml +++ b/.github/workflows/tests_serial.yml @@ -27,13 +27,7 @@ jobs: uses: mamba-org/setup-micromamba@v1 with: environment-file: .github/micromamba/testenv.yml - create-args: >- - fenics=2019 - meshio">=5.0.0" - pytest">=7.0.0" - gmsh">=4.8" - occt"<=7.7.0" - python=${{ matrix.python-version }} + create-args: fenics=2019 meshio">=5.0.0" pytest">=7.0.0" gmsh">=4.8" occt"<=7.7.0" python=${{ matrix.python-version }} - name: Install package run: | From bc378878e1db0d0ef659441b367e52977b4d90c5 Mon Sep 17 00:00:00 2001 From: Sebastian Blauth Date: Wed, 28 Jun 2023 11:33:03 +0200 Subject: [PATCH 3/4] Try using the mamba action without quotation marks --- .github/workflows/tests_serial.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests_serial.yml b/.github/workflows/tests_serial.yml index 95c5b182..f18e3cb7 100644 --- a/.github/workflows/tests_serial.yml +++ b/.github/workflows/tests_serial.yml @@ -27,7 +27,7 @@ jobs: uses: mamba-org/setup-micromamba@v1 with: environment-file: .github/micromamba/testenv.yml - create-args: fenics=2019 meshio">=5.0.0" pytest">=7.0.0" gmsh">=4.8" occt"<=7.7.0" python=${{ matrix.python-version }} + create-args: fenics=2019 meshio>=5.0.0 pytest>=7.0.0 gmsh>=4.8 occt<=7.7.0 python=${{ matrix.python-version }} - name: Install package run: | From 16915eba89cdab29515892cdfd77c46201cfbc5f Mon Sep 17 00:00:00 2001 From: Sebastian Blauth Date: Wed, 28 Jun 2023 11:43:21 +0200 Subject: [PATCH 4/4] Remove all quotation marks from micromamba workflows --- .github/workflows/test_demos.yml | 16 ++++++++-------- .github/workflows/tests_macos.yml | 8 ++++---- .github/workflows/tests_parallel.yml | 8 ++++---- .github/workflows/tests_serial.yml | 8 +++++++- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test_demos.yml b/.github/workflows/test_demos.yml index a9a1aad4..94a14368 100644 --- a/.github/workflows/test_demos.yml +++ b/.github/workflows/test_demos.yml @@ -25,10 +25,10 @@ jobs: environment-file: .github/micromamba/testenv.yml create-args: >- fenics=2019 - meshio">=5.0.0" - pytest">=7.0.0" - gmsh">=4.8" - occt"<=7.7.0" + meshio>=5.0.0 + pytest>=7.0.0 + gmsh>=4.8 + occt<=7.7.0 matplotlib python=3.11 @@ -63,10 +63,10 @@ jobs: environment-file: .github/micromamba/testenv.yml create-args: >- fenics=2019 - meshio">=5.0.0" - pytest">=7.0.0" - gmsh">=4.8" - occt"<=7.7.0" + meshio>=5.0.0 + pytest>=7.0.0 + gmsh>=4.8 + occt<=7.7.0 mpich matplotlib python=3.11 diff --git a/.github/workflows/tests_macos.yml b/.github/workflows/tests_macos.yml index 98c5c221..e56b324f 100644 --- a/.github/workflows/tests_macos.yml +++ b/.github/workflows/tests_macos.yml @@ -29,10 +29,10 @@ jobs: create-args: >- python=${{ matrix.python-version }} fenics=2019 - meshio">=5.0.0" - pytest">=7.0.0" - gmsh">=4.8" - occt"<=7.7.0" + meshio>=5.0.0 + pytest>=7.0.0 + gmsh>=4.8 + occt<=7.7.0 - name: Install package run: | diff --git a/.github/workflows/tests_parallel.yml b/.github/workflows/tests_parallel.yml index ee578802..c3b7de0c 100644 --- a/.github/workflows/tests_parallel.yml +++ b/.github/workflows/tests_parallel.yml @@ -32,10 +32,10 @@ jobs: environment-file: .github/micromamba/testenv.yml create-args: >- fenics=2019 - meshio">=5.0.0" - pytest">=7.0.0" - gmsh">=4.8" - occt"<=7.7.0" + meshio>=5.0.0 + pytest>=7.0.0 + gmsh>=4.8 + occt<=7.7.0 ${{ matrix.mpi }} python=${{ matrix.python-version }} diff --git a/.github/workflows/tests_serial.yml b/.github/workflows/tests_serial.yml index f18e3cb7..091b7281 100644 --- a/.github/workflows/tests_serial.yml +++ b/.github/workflows/tests_serial.yml @@ -27,7 +27,13 @@ jobs: uses: mamba-org/setup-micromamba@v1 with: environment-file: .github/micromamba/testenv.yml - create-args: fenics=2019 meshio>=5.0.0 pytest>=7.0.0 gmsh>=4.8 occt<=7.7.0 python=${{ matrix.python-version }} + create-args: >- + fenics=2019 + meshio>=5.0.0 + pytest>=7.0.0 + gmsh>=4.8 + occt<=7.7.0 + python=${{ matrix.python-version }} - name: Install package run: |