diff --git a/.github/workflows/job4-msmpi.yml b/.github/workflows/job4-msmpi.yml index e19145c8c..faccc28f5 100644 --- a/.github/workflows/job4-msmpi.yml +++ b/.github/workflows/job4-msmpi.yml @@ -51,9 +51,9 @@ jobs: autoreconf -i ./configure --enable-generic --enable-optim --enable-download --enable-maintainer-mode \ --prefix="${HOME}/freefem" \ - --with-mpipath="/c/Progam Files/Microsoft MPI/Bin" + --with-mpipath="/c/Progam Files/Microsoft MPI/Bin" \ MPICC=mpicc MPICXX=mpicxx MPIFC=mpif90 - # ./3rdparty/getall -a -o PETSc + ./3rdparty/getall -a -o PETSc - name: PETSc run: | diff --git a/.github/workflows/job5-msmpi.yml b/.github/workflows/job5-msmpi.yml index 00c3f21fd..fcf457957 100644 --- a/.github/workflows/job5-msmpi.yml +++ b/.github/workflows/job5-msmpi.yml @@ -11,11 +11,10 @@ jobs: shell: msys2 {0} steps: - - name: Install MS-MPI - shell: cmd - run: | - curl -L -O https://github.com/microsoft/Microsoft-MPI/releases/download/v10.1.1/msmpisetup.exe - .\msmpisetup.exe -unattend -force + - name: Setup MPI + uses: mpi4py/setup-mpi@v1 + with: + mpi: msmpi - uses: msys2/setup-msys2@v2 with: @@ -53,6 +52,7 @@ jobs: autoreconf -i ./configure --enable-generic --enable-optim --enable-download --enable-maintainer-mode --enable-debug \ --prefix="${HOME}/freefem" \ + --with-mpipath="/c/Progam Files/Microsoft MPI/Bin" \ MPICC=mpicc MPICXX=mpicxx MPIFC=mpif90 ./3rdparty/getall -a -o PETSc diff --git a/.github/workflows/release-dmg-arm.yml b/.github/workflows/release-dmg-arm.yml index 987157725..35f43f922 100644 --- a/.github/workflows/release-dmg-arm.yml +++ b/.github/workflows/release-dmg-arm.yml @@ -1,10 +1,10 @@ name: Release MacOS ARM64 on: - push - # workflow_run: - # workflows: ['Release'] - # types: - # - completed + # push + workflow_run: + workflows: ['Release'] + types: + - completed jobs: macos: diff --git a/.github/workflows/release-exe.yml b/.github/workflows/release-exe.yml index 5b541393c..a04a404e3 100644 --- a/.github/workflows/release-exe.yml +++ b/.github/workflows/release-exe.yml @@ -1,12 +1,11 @@ name: Release Windows on: - # push - workflow_run: - workflows: ['Release'] - types: - - completed + push + # workflow_run: + # workflows: ['Release'] + # types: + # - completed - # TODO re-activate petsc copy in WindowPackage.m4, line 172 jobs: windows: name: EXE release @@ -16,11 +15,10 @@ jobs: shell: msys2 {0} steps: - - name: Install MS-MPI - shell: cmd - run: | - curl -L -O https://github.com/microsoft/Microsoft-MPI/releases/download/v10.1.1/msmpisetup.exe - .\msmpisetup.exe -unattend -force + - name: Setup MPI + uses: mpi4py/setup-mpi@v1 + with: + mpi: msmpi - uses: msys2/setup-msys2@v2 with: @@ -56,7 +54,8 @@ jobs: run: | autoreconf -i ./configure --enable-generic --enable-optim --enable-download --enable-maintainer-mode \ - MPICC=mpicc MPICXX=mpicxx MPIFC=mpif90 + --with-mpipath="/c/Progam Files/Microsoft MPI/Bin" \ + MPICC=mpicc MPICXX=mpicxx MPIFC=mpif90 ./3rdparty/getall -a - name: PETSc