Merge pull request #68 from SotaYoshida/develop

Develop
SotaYoshida · Jan 14, 2023 · fc9a57f · fc9a57f
2 parents 706d1b8 + 0c00060
commit fc9a57f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -19,7 +19,7 @@ jobs:
         include:
           - {version: '1.8',   os: ubuntu-latest,  payload: serial}
           - {version: '1.8',   os: macOS-latest,   payload: serial}
-          - {version: '1.8',   os: windows-2019,   payload: serial}
+          - {version: '1.8',   os: windows-latest, payload: serial}
           - {version: nightly, os: ubuntu-latest,  payload: serial}
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/CI_pullrequest.yml b/.github/workflows/CI_pullrequest.yml
@@ -19,10 +19,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {version: '1.7',   os: ubuntu-latest,  payload: serial}
-          - {version: '1.7',   os: macOS-latest,   payload: serial}
-          - {version: '1.7',   os: windows-2019,   payload: serial}
-          - {version: nightly,   os: ubuntu-latest,  payload: serial}
+          - {version: '1.8',   os: ubuntu-latest,  payload: serial}
+          - {version: '1.8',   os: macOS-latest,   payload: serial}
+          - {version: '1.8',   os: windows-latest, payload: serial}
+          - {version: nightly, os: ubuntu-latest,  payload: serial}
     steps:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1
@@ -42,7 +42,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {version: '1.7',   os: ubuntu-latest,  payload: mpi}
+          - {version: '1.8',   os: ubuntu-latest,  payload: mpi}
         mpi: [ 'openmpi' ]
     name: mpi test
     steps:
@@ -53,18 +53,24 @@ jobs:
           arch: x64
       - uses: julia-actions/cache@v1
       - uses: julia-actions/julia-buildpkg@v1
-      - name: Setup MPI
-        uses: mpi4py/setup-mpi@v1
-        with:
-          mpi: ${{ matrix.mpi }}
-      - run: mpiexec -n 4 julia --project="@." ./test/mpirun_test.jl
+      - name: "Run mpi tests"
+        run: |
+          export JULIA_PROJECT=@.
+          export JULIA_MPIEXEC=mpiexecjl
+          export JULIA_NUM_THREADS=1
+          julia --project -e 'ENV["JULIA_MPI_BINARY"]=""; using Pkg; Pkg.add("MPI"); Pkg.build("MPI"; verbose=true); using MPI; MPI.install_mpiexecjl()'
+          julia --project=@. -e "using InteractiveUtils; versioninfo(verbose=true)"
+          julia --project=@. -e "using Pkg; Pkg.instantiate(); Pkg.build()"
+          export PATH=$PATH:/home/runner/.julia/bin
+          mpiexecjl -n 4 julia --depwarn=yes --project=@. ./test/mpirun_test.jl	  
+
   # build2:    
   #   runs-on: ubuntu-latest
   #   strategy:
   #     fail-fast: false
   #     matrix:
   #       include:
-  #         - {version: '1.7',   os: ubuntu-latest}
+  #         - {version: '1.8',   os: ubuntu-latest}
   #   name: Run sample_script.jl
   #   steps:     
   #     - uses: actions/checkout@v2
@@ -94,7 +100,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1
         with:
-          version: '1.7'
+          version: '1.8'
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-docdeploy@v1
         env: