From 39ea623fb59cc51254998d6382bacf9e041398f8 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 15:52:43 -0600 Subject: [PATCH 01/59] Updating github actions --- .github/workflows/CI.yml | 10 ++++++++-- .github/workflows/CI2.yml | 17 ----------------- 2 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 .github/workflows/CI2.yml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9e8694c8..9f99ea1a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -2,14 +2,20 @@ name: Continuous Integration # This workflow is triggered on pushes to the repository. -on: [push, pull_request] +on: + push: + branches: + - * + pull_request: + branches: + - * jobs: build: name: Testing runs-on: ubunto-latest steps: - - name: actions/checkout@master + - uses: actions/checkout@v2 - name: mkdir bin run: mkdir bin; cd bin - name: cmake diff --git a/.github/workflows/CI2.yml b/.github/workflows/CI2.yml deleted file mode 100644 index 33bcda7b..00000000 --- a/.github/workflows/CI2.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: CI - -on: [push] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - name: Run a one-line script - run: echo Hello, world! - - name: Run a multi-line script - run: | - echo Add other actions to build, - echo test, and deploy your project. From 7fd82386727a56fc1a1260892bb91790c0d72cbc Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 15:57:03 -0600 Subject: [PATCH 02/59] Fixing workflow syntax. --- .github/workflows/{CI.yml => ContinuousIntegration.yml} | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename .github/workflows/{CI.yml => ContinuousIntegration.yml} (88%) diff --git a/.github/workflows/CI.yml b/.github/workflows/ContinuousIntegration.yml similarity index 88% rename from .github/workflows/CI.yml rename to .github/workflows/ContinuousIntegration.yml index 9f99ea1a..f870cc1f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -5,10 +5,10 @@ name: Continuous Integration on: push: branches: - - * + - * pull_request: branches: - - * + - * jobs: build: @@ -19,8 +19,7 @@ jobs: - name: mkdir bin run: mkdir bin; cd bin - name: cmake - run: cmake .. - - name: make + run: cmake .. - name: make run: make - name: make test run: make test From 9fc8836d4a50ebb674a151b82abc363cc3f11218 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 15:57:59 -0600 Subject: [PATCH 03/59] Fixing workflow syntax. --- .github/workflows/ContinuousIntegration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index f870cc1f..be438655 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -5,10 +5,10 @@ name: Continuous Integration on: push: branches: - - * + - '*' pull_request: branches: - - * + - '*' jobs: build: From 7d4790967bd16c073d510506255d19c14682501d Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 15:59:08 -0600 Subject: [PATCH 04/59] Fixing workflow syntax. --- .github/workflows/ContinuousIntegration.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index be438655..10c99be8 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -19,7 +19,8 @@ jobs: - name: mkdir bin run: mkdir bin; cd bin - name: cmake - run: cmake .. - name: make + run: cmake .. + - name: make run: make - name: make test run: make test From 0842dd980044831a47d72e5b86dd3bf39bf885bb Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:00:38 -0600 Subject: [PATCH 05/59] Fixing workflow syntax. --- .github/workflows/ContinuousIntegration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 10c99be8..ab887fbf 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -13,7 +13,7 @@ on: jobs: build: name: Testing - runs-on: ubunto-latest + - runs-on: ubunto-latest steps: - uses: actions/checkout@v2 - name: mkdir bin From 07d070fa0d0bd681d7b9c34ace4b9a33c1df8674 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:01:16 -0600 Subject: [PATCH 06/59] Fixing ubuntu name --- .github/workflows/ContinuousIntegration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index ab887fbf..e0eec2df 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -13,7 +13,7 @@ on: jobs: build: name: Testing - - runs-on: ubunto-latest + - runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: mkdir bin From 2a1d31538bbe06a5492412008dec0ec67656e58d Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:02:24 -0600 Subject: [PATCH 07/59] Fixing workflow syntax. --- .github/workflows/ContinuousIntegration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index e0eec2df..90529afe 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -13,7 +13,7 @@ on: jobs: build: name: Testing - - runs-on: ubuntu-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: mkdir bin From 0b7f240510c6bbc1c316a308570b37f1d4562a74 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:06:47 -0600 Subject: [PATCH 08/59] Removing sub-point under branch. --- .github/workflows/ContinuousIntegration.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 90529afe..bb53ac6d 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -4,11 +4,9 @@ name: Continuous Integration # This workflow is triggered on pushes to the repository. on: push: - branches: - - '*' + branches: '*' pull_request: - branches: - - '*' + branches: '*' jobs: build: From 65ace4c76b36cbe47322b76da5770b40c86c70ce Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:08:51 -0600 Subject: [PATCH 09/59] Putting buidl name in quotes. --- .github/workflows/ContinuousIntegration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index bb53ac6d..05d811be 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -10,7 +10,7 @@ on: jobs: build: - name: Testing + name: "Testing" runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From 323296064d07e1d591761ea3cf8b56962a6296a8 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:10:58 -0600 Subject: [PATCH 10/59] Fixing indentation. --- .github/workflows/ContinuousIntegration.yml | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 05d811be..c70fd063 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -10,15 +10,15 @@ on: jobs: build: - name: "Testing" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: mkdir bin - run: mkdir bin; cd bin - - name: cmake - run: cmake .. - - name: make - run: make - - name: make test - run: make test + name: "Testing" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: mkdir bin + run: mkdir bin; cd bin + - name: cmake + run: cmake .. + - name: make + run: make + - name: make test + run: make test From a81ec02990ebb2dff23e33252142b494a1ddd1e0 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:13:06 -0600 Subject: [PATCH 11/59] Adding ls as debug continues. --- .github/workflows/ContinuousIntegration.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index c70fd063..07f9dc80 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -14,6 +14,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - name: ls + run: ls - name: mkdir bin run: mkdir bin; cd bin - name: cmake From 22c4e48088910c1d7323ab241c3a7040b9db3375 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:14:59 -0600 Subject: [PATCH 12/59] Debugging continues. --- .github/workflows/ContinuousIntegration.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 07f9dc80..8dc1d723 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -18,6 +18,8 @@ jobs: run: ls - name: mkdir bin run: mkdir bin; cd bin + - name: ls-bin + run: ls; ls ..; pwd - name: cmake run: cmake .. - name: make From 686968d64f390934583b52e0b0e4419d52bb94df Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:17:22 -0600 Subject: [PATCH 13/59] separating things out. --- .github/workflows/ContinuousIntegration.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 8dc1d723..a9c96eca 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -17,9 +17,14 @@ jobs: - name: ls run: ls - name: mkdir bin - run: mkdir bin; cd bin + run: + - mkdir bin + - cd bin - name: ls-bin - run: ls; ls ..; pwd + run: + - ls + - ls .. + - pwd - name: cmake run: cmake .. - name: make From ba49b6e55d0fc14546c449247251b39f50138c26 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:21:13 -0600 Subject: [PATCH 14/59] That didn't work. --- .github/workflows/ContinuousIntegration.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index a9c96eca..fc61755f 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -17,14 +17,13 @@ jobs: - name: ls run: ls - name: mkdir bin - run: - - mkdir bin - - cd bin + run: mkdir bin; cd bin + - name: pwd-bin + run: pwd - name: ls-bin - run: - - ls - - ls .. - - pwd + run: ls + - name: ls..-bin + run ls .. - name: cmake run: cmake .. - name: make From 3823d1be93ee464d9e95888fb07e1645cea135e9 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:21:49 -0600 Subject: [PATCH 15/59] Forgot :. --- .github/workflows/ContinuousIntegration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index fc61755f..15fa5d25 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -23,7 +23,7 @@ jobs: - name: ls-bin run: ls - name: ls..-bin - run ls .. + run: ls .. - name: cmake run: cmake .. - name: make From 68cf183ee0ed1e744f5efe296e8bce05107c55e6 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:23:32 -0600 Subject: [PATCH 16/59] Converting ; to &&. --- .github/workflows/ContinuousIntegration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 15fa5d25..82cda0a9 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -17,7 +17,7 @@ jobs: - name: ls run: ls - name: mkdir bin - run: mkdir bin; cd bin + run: mkdir bin && cd bin - name: pwd-bin run: pwd - name: ls-bin From a00e3ac5654c22da19e0f501570d03c9f6eb56ba Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:26:47 -0600 Subject: [PATCH 17/59] Trying something multiline. --- .github/workflows/ContinuousIntegration.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 82cda0a9..346a1f18 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -17,7 +17,9 @@ jobs: - name: ls run: ls - name: mkdir bin - run: mkdir bin && cd bin + run: | + mkdir bin + cd bin - name: pwd-bin run: pwd - name: ls-bin From 5dadc3867738cfe392b07e39886a0c5a21fab84e Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:30:35 -0600 Subject: [PATCH 18/59] This is insane --- .github/workflows/ContinuousIntegration.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 346a1f18..7e0f4c80 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -20,6 +20,8 @@ jobs: run: | mkdir bin cd bin + - name: cd bin + run: cd bin - name: pwd-bin run: pwd - name: ls-bin From f7a233385407bc566001b9b4354b2c19456be9a8 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:33:08 -0600 Subject: [PATCH 19/59] I don't know why this doesn't work. --- .github/workflows/ContinuousIntegration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 7e0f4c80..dd54d852 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -19,6 +19,7 @@ jobs: - name: mkdir bin run: | mkdir bin + ls cd bin - name: cd bin run: cd bin From 9c05ab845ad87158a07cf0c72843369dc7c105f8 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:36:48 -0600 Subject: [PATCH 20/59] Adding working-directory. --- .github/workflows/ContinuousIntegration.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index dd54d852..d2b8735b 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -14,24 +14,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: ls - run: ls - name: mkdir bin - run: | - mkdir bin - ls - cd bin - - name: cd bin - run: cd bin - - name: pwd-bin - run: pwd - - name: ls-bin - run: ls - - name: ls..-bin - run: ls .. + run: mkdir bin - name: cmake run: cmake .. + working-directory: ./bin - name: make run: make + working-directory: ./bin - name: make test run: make test + working-directory: ./bin From b61e7dfd5a26c80a54d3f7e3910f9dde997f8b8d Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:47:20 -0600 Subject: [PATCH 21/59] Installing gfortran. --- .github/workflows/ContinuousIntegration.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index d2b8735b..df029b60 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -14,6 +14,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - name: Install gfortran + run: sudo apt-get install gfortran - name: mkdir bin run: mkdir bin - name: cmake From 615e5737e48fcc3bb72ae8c7f045a9d9849ce209 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 16:49:19 -0600 Subject: [PATCH 22/59] Building/testing in parallel. --- .github/workflows/ContinuousIntegration.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index df029b60..3b8cf3aa 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -13,17 +13,17 @@ jobs: name: "Testing" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - name: Install gfortran run: sudo apt-get install gfortran + - uses: actions/checkout@v2 - name: mkdir bin run: mkdir bin - name: cmake run: cmake .. working-directory: ./bin - name: make - run: make + run: make -j working-directory: ./bin - - name: make test - run: make test + - name: ctest + run: ctest -j working-directory: ./bin From ff0b88fc8c7db09c966ab1864037ad06ce492694 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 17:00:26 -0600 Subject: [PATCH 23/59] Trying to add multiple OSs. --- .github/workflows/ContinuousIntegration.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 3b8cf3aa..11bf10cb 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -8,6 +8,10 @@ on: pull_request: branches: '*' +strategy: + matrix: + os: [ubuntu-18.04, macOS] + jobs: build: name: "Testing" From 1cbbd5b86a1baca2be499b6cefcd02f96803e475 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 17:01:13 -0600 Subject: [PATCH 24/59] fixing runs-on --- .github/workflows/ContinuousIntegration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 11bf10cb..b4a115a4 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -15,7 +15,7 @@ strategy: jobs: build: name: "Testing" - runs-on: ubuntu-latest + runs-on: ${{matrix.os}} steps: - name: Install gfortran run: sudo apt-get install gfortran From dff6647e7c703f30d6dc362b980497614bc695be Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 17:03:27 -0600 Subject: [PATCH 25/59] moving strategy --- .github/workflows/ContinuousIntegration.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index b4a115a4..08507dce 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -8,13 +8,13 @@ on: pull_request: branches: '*' -strategy: - matrix: - os: [ubuntu-18.04, macOS] jobs: + strategy: + matrix: + os: [ubuntu-18.04, macOS] build: - name: "Testing" + name: "Testing ${{matrix.os}}" runs-on: ${{matrix.os}} steps: - name: Install gfortran From 0577b88cb3035c34d4a5757501d7d3cc9f5f87a0 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 17:04:22 -0600 Subject: [PATCH 26/59] Moving things around --- .github/workflows/ContinuousIntegration.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 08507dce..cc93c827 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -8,14 +8,13 @@ on: pull_request: branches: '*' - +runs-on: ${{matrix.os}} +strategy: + matrix: + os: [ubuntu-18.04, macOS] jobs: - strategy: - matrix: - os: [ubuntu-18.04, macOS] build: - name: "Testing ${{matrix.os}}" - runs-on: ${{matrix.os}} + name: "Testing" steps: - name: Install gfortran run: sudo apt-get install gfortran From 5d27c7b8fca06d1f238010920cabefe64fe5910e Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 1 Apr 2020 17:10:39 -0600 Subject: [PATCH 27/59] Remove name --- .github/workflows/ContinuousIntegration.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index cc93c827..9d198bac 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -8,13 +8,12 @@ on: pull_request: branches: '*' -runs-on: ${{matrix.os}} -strategy: - matrix: - os: [ubuntu-18.04, macOS] jobs: build: - name: "Testing" + runs-on: ${{matrix.os}} + strategy: + matrix: + os: [ubuntu-18.04, macOS] steps: - name: Install gfortran run: sudo apt-get install gfortran From df09b57074d9ef1b0ee08586aeeaa3a2b50d4485 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 06:31:51 -0600 Subject: [PATCH 28/59] Only installing gfortran for Linux. --- .github/workflows/ContinuousIntegration.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 9d198bac..94765a18 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -15,7 +15,8 @@ jobs: matrix: os: [ubuntu-18.04, macOS] steps: - - name: Install gfortran + - name: Install gfortran for Linux + if: matrix.os == 'ubuntu-18.04' run: sudo apt-get install gfortran - uses: actions/checkout@v2 - name: mkdir bin From 37f193356da2620a9b2067c0ec1d2db169f6a02e Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 06:42:03 -0600 Subject: [PATCH 29/59] Adding badge to README. --- .github/workflows/ContinuousIntegration.yml | 34 ++++++++++++--------- README.md | 2 ++ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 94765a18..025d56a2 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -15,18 +15,22 @@ jobs: matrix: os: [ubuntu-18.04, macOS] steps: - - name: Install gfortran for Linux - if: matrix.os == 'ubuntu-18.04' - run: sudo apt-get install gfortran - - uses: actions/checkout@v2 - - name: mkdir bin - run: mkdir bin - - name: cmake - run: cmake .. - working-directory: ./bin - - name: make - run: make -j - working-directory: ./bin - - name: ctest - run: ctest -j - working-directory: ./bin + - name: gfortran + run: | + which gfortran + gofrtran --version + # - name: Install gfortran for Linux + # if: matrix.os == 'ubuntu-18.04' + # run: sudo apt-get install gfortran + # - uses: actions/checkout@v2 + # - name: mkdir bin + # run: mkdir bin + # - name: cmake + # run: cmake .. + # working-directory: ./bin + # - name: make + # run: make -j + # working-directory: ./bin + # - name: ctest + # run: ctest -j + # working-directory: ./bin diff --git a/README.md b/README.md index 33b15614..08519eab 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +![](https://github.com/njoy/NJOY2016/workflows/Continuous%20Integration/badge.svg) + # NJOY2016 The NJOY Nuclear Data Processing System is a modular computer code designed to read evaluated data in ENDF format, transform the data in various ways, and output the results as libraries designed to be used in various applications. Each module performs a well defined processing task. The modules are essentially independent programs, and they communicate with each other using input and output files, plus a very few common variables. From 0412f6e9d164bc7608c698ff5d70642dceeb938a Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 06:52:23 -0600 Subject: [PATCH 30/59] Changing a bit the command for gfortran. --- .github/workflows/ContinuousIntegration.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 025d56a2..9815d715 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -16,9 +16,14 @@ jobs: os: [ubuntu-18.04, macOS] steps: - name: gfortran + if: matrix.os == 'ubuntu-18.04' + run: | + which gfortran-9 + gfortran-9 --version + if: matrix.os == 'macOS' run: | which gfortran - gofrtran --version + gfortran --version # - name: Install gfortran for Linux # if: matrix.os == 'ubuntu-18.04' # run: sudo apt-get install gfortran From 0093e02c60b1746a316afcdf110277dc0aefe054 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 06:53:10 -0600 Subject: [PATCH 31/59] Fixing syntax. --- .github/workflows/ContinuousIntegration.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 9815d715..b0ee3a52 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -17,13 +17,13 @@ jobs: steps: - name: gfortran if: matrix.os == 'ubuntu-18.04' - run: | - which gfortran-9 - gfortran-9 --version - if: matrix.os == 'macOS' - run: | - which gfortran - gfortran --version + run: | + which gfortran-9 + gfortran-9 --version + else: matrix.os == 'macOS' + run: | + which gfortran + gfortran --version # - name: Install gfortran for Linux # if: matrix.os == 'ubuntu-18.04' # run: sudo apt-get install gfortran From f7efff81ff812a5ace62b8c0b7edab873c059564 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 06:53:55 -0600 Subject: [PATCH 32/59] Changing indentation. --- .github/workflows/ContinuousIntegration.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index b0ee3a52..bf5ba077 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -17,13 +17,13 @@ jobs: steps: - name: gfortran if: matrix.os == 'ubuntu-18.04' - run: | - which gfortran-9 - gfortran-9 --version + run: | + which gfortran-9 + gfortran-9 --version else: matrix.os == 'macOS' - run: | - which gfortran - gfortran --version + run: | + which gfortran + gfortran --version # - name: Install gfortran for Linux # if: matrix.os == 'ubuntu-18.04' # run: sudo apt-get install gfortran From 46e6cf8b9f70d57ca3b9d9e97d9811b5481f81c9 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 06:58:07 -0600 Subject: [PATCH 33/59] adding another step. --- .github/workflows/ContinuousIntegration.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index bf5ba077..5c5dc7db 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -15,12 +15,13 @@ jobs: matrix: os: [ubuntu-18.04, macOS] steps: - - name: gfortran + - name: gfortran for Linux if: matrix.os == 'ubuntu-18.04' run: | which gfortran-9 gfortran-9 --version - else: matrix.os == 'macOS' + - name: gfortran for Mac + if: matrix.os == 'macOS' run: | which gfortran gfortran --version From 0fa1a4af3db68c8db5cef2a9b8615b8f509f8628 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 07:08:14 -0600 Subject: [PATCH 34/59] Adding OS-specific variables. --- .github/workflows/ContinuousIntegration.yml | 22 +++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 5c5dc7db..81c0ba83 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -13,18 +13,20 @@ jobs: runs-on: ${{matrix.os}} strategy: matrix: - os: [ubuntu-18.04, macOS] + os: [ubuntu-latest, macos-latest] + include: + - os: ubuntu-latest + env: + FORTRAN: gfortran-9 + - os: macos-latest + env: + FORTRAN: gfortran + steps: - - name: gfortran for Linux - if: matrix.os == 'ubuntu-18.04' - run: | - which gfortran-9 - gfortran-9 --version - - name: gfortran for Mac - if: matrix.os == 'macOS' + - name: which gfortran run: | - which gfortran - gfortran --version + which $FORTRAN + $FORTRAN --version # - name: Install gfortran for Linux # if: matrix.os == 'ubuntu-18.04' # run: sudo apt-get install gfortran From 6e994aae69b980c6c5ae34235d0c51300aa07bf6 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 07:09:30 -0600 Subject: [PATCH 35/59] Fixing use of varible. --- .github/workflows/ContinuousIntegration.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 81c0ba83..d4135ddc 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -17,16 +17,16 @@ jobs: include: - os: ubuntu-latest env: - FORTRAN: gfortran-9 + vFortran: gfortran-9 - os: macos-latest env: - FORTRAN: gfortran + vFortran: gfortran steps: - name: which gfortran run: | - which $FORTRAN - $FORTRAN --version + which ${{vFortran}} + ${{vFortran}} --version # - name: Install gfortran for Linux # if: matrix.os == 'ubuntu-18.04' # run: sudo apt-get install gfortran From 80186032559b9faf1f7708c3aaa9102bbd11cc98 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 07:11:13 -0600 Subject: [PATCH 36/59] I don't know syntax. --- .github/workflows/ContinuousIntegration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index d4135ddc..6a3ecc9e 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -25,8 +25,8 @@ jobs: steps: - name: which gfortran run: | - which ${{vFortran}} - ${{vFortran}} --version + which ${{matrix.vFortran}} + ${{matrix.vFortran}} --version # - name: Install gfortran for Linux # if: matrix.os == 'ubuntu-18.04' # run: sudo apt-get install gfortran From d8f2ed554d450ae54922cca139370b221b3a73a2 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 07:12:42 -0600 Subject: [PATCH 37/59] I still don't know syntax. --- .github/workflows/ContinuousIntegration.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 6a3ecc9e..35295276 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -16,11 +16,9 @@ jobs: os: [ubuntu-latest, macos-latest] include: - os: ubuntu-latest - env: - vFortran: gfortran-9 + vFortran: gfortran-9 - os: macos-latest - env: - vFortran: gfortran + vFortran: gfortran steps: - name: which gfortran From 945fa52c06fd5f938f28d5e0010935004bd686f2 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 07:14:38 -0600 Subject: [PATCH 38/59] Adding back in the cmake command. --- .github/workflows/ContinuousIntegration.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 35295276..472f562c 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -25,18 +25,15 @@ jobs: run: | which ${{matrix.vFortran}} ${{matrix.vFortran}} --version - # - name: Install gfortran for Linux - # if: matrix.os == 'ubuntu-18.04' - # run: sudo apt-get install gfortran - # - uses: actions/checkout@v2 - # - name: mkdir bin - # run: mkdir bin - # - name: cmake - # run: cmake .. - # working-directory: ./bin - # - name: make - # run: make -j - # working-directory: ./bin + - uses: actions/checkout@v2 + - name: mkdir bin + run: mkdir bin + - name: cmake + run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}} .. + working-directory: ./bin + - name: make + run: make -j + working-directory: ./bin # - name: ctest # run: ctest -j # working-directory: ./bin From 92886379c35276bc7a9f395b287d8f209d0871c6 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 07:16:06 -0600 Subject: [PATCH 39/59] Forgot closing tic mark. --- .github/workflows/ContinuousIntegration.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 472f562c..a35a8667 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -19,6 +19,7 @@ jobs: vFortran: gfortran-9 - os: macos-latest vFortran: gfortran + # build_type: [ Debug, Release ] steps: - name: which gfortran @@ -29,7 +30,7 @@ jobs: - name: mkdir bin run: mkdir bin - name: cmake - run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}} .. + run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` .. working-directory: ./bin - name: make run: make -j From 3283923757702182e61a168392c48d7be8a9d23b Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 07:18:45 -0600 Subject: [PATCH 40/59] Adding in different build types. --- .github/workflows/ContinuousIntegration.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index a35a8667..1a236f1f 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -19,7 +19,7 @@ jobs: vFortran: gfortran-9 - os: macos-latest vFortran: gfortran - # build_type: [ Debug, Release ] + build_type: [ Debug, Release ] steps: - name: which gfortran @@ -30,11 +30,11 @@ jobs: - name: mkdir bin run: mkdir bin - name: cmake - run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` .. + run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} .. working-directory: ./bin - name: make run: make -j working-directory: ./bin - # - name: ctest - # run: ctest -j - # working-directory: ./bin + - name: ctest + run: ctest -j + working-directory: ./bin From 78fc710ff8db9389531e2df9dbf490790b5ecfba Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 08:29:13 -0600 Subject: [PATCH 41/59] Trying to rever to gfortran-8. --- .github/workflows/ContinuousIntegration.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 1a236f1f..117f79ee 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -13,12 +13,12 @@ jobs: runs-on: ${{matrix.os}} strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-18.04, macos-10.15] include: - os: ubuntu-latest - vFortran: gfortran-9 + vFortran: gfortran-8 - os: macos-latest - vFortran: gfortran + vFortran: gfortran-8 build_type: [ Debug, Release ] steps: @@ -36,5 +36,5 @@ jobs: run: make -j working-directory: ./bin - name: ctest - run: ctest -j + run: ctest -V -j working-directory: ./bin From dace74c840934cbeeb3a1bd651a1d3df411f2946 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 08:45:04 -0600 Subject: [PATCH 42/59] Learning what fortran commands are available to me. --- .github/workflows/ContinuousIntegration.yml | 36 +++++++++++---------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 117f79ee..ed7a70a4 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -19,22 +19,24 @@ jobs: vFortran: gfortran-8 - os: macos-latest vFortran: gfortran-8 - build_type: [ Debug, Release ] + # build_type: [ Debug, Release ] steps: - - name: which gfortran - run: | - which ${{matrix.vFortran}} - ${{matrix.vFortran}} --version - - uses: actions/checkout@v2 - - name: mkdir bin - run: mkdir bin - - name: cmake - run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} .. - working-directory: ./bin - - name: make - run: make -j - working-directory: ./bin - - name: ctest - run: ctest -V -j - working-directory: ./bin + - name: compgen + run: compgen -c | grep gfortran + # - name: which gfortran + # run: | + # which ${{matrix.vFortran}} + # ${{matrix.vFortran}} --version + # - uses: actions/checkout@v2 + # - name: mkdir bin + # run: mkdir bin + # - name: cmake + # run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} .. + # working-directory: ./bin + # - name: make + # run: make -j + # working-directory: ./bin + # - name: ctest + # run: ctest -V -j + # working-directory: ./bin From e6639597ab2f0e44b0a8c8e0259678749d23a0dd Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 08:48:06 -0600 Subject: [PATCH 43/59] Finding gfortran-8 --- .github/workflows/ContinuousIntegration.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index ed7a70a4..8d25379f 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -24,10 +24,10 @@ jobs: steps: - name: compgen run: compgen -c | grep gfortran - # - name: which gfortran - # run: | - # which ${{matrix.vFortran}} - # ${{matrix.vFortran}} --version + - name: which gfortran + run: | + which gfortran-8 + gfortran-8 --version # - uses: actions/checkout@v2 # - name: mkdir bin # run: mkdir bin From ddc7fede068b62874433b9fd93da19248817767a Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 08:49:18 -0600 Subject: [PATCH 44/59] Fixing indentation --- .github/workflows/ContinuousIntegration.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 8d25379f..5d694fcb 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -24,10 +24,10 @@ jobs: steps: - name: compgen run: compgen -c | grep gfortran - - name: which gfortran - run: | - which gfortran-8 - gfortran-8 --version + - name: which gfortran + run: | + which gfortran-8 + gfortran-8 --version # - uses: actions/checkout@v2 # - name: mkdir bin # run: mkdir bin From 566c4771fe516d7c81d7a9d554cbdf0770537ba1 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 08:51:58 -0600 Subject: [PATCH 45/59] Running with gfortran 8 --- .github/workflows/ContinuousIntegration.yml | 41 +++++++++++---------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 5d694fcb..4f6d8f25 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -14,29 +14,30 @@ jobs: strategy: matrix: os: [ubuntu-18.04, macos-10.15] - include: - - os: ubuntu-latest - vFortran: gfortran-8 - - os: macos-latest - vFortran: gfortran-8 - # build_type: [ Debug, Release ] + build_type: [ Debug, Release ] + vFortran: gfortran-8 + # include: + # - os: ubuntu-latest + # vFortran: gfortran-8 + # - os: macos-latest + # vFortran: gfortran-8 steps: - name: compgen run: compgen -c | grep gfortran - name: which gfortran run: | - which gfortran-8 - gfortran-8 --version - # - uses: actions/checkout@v2 - # - name: mkdir bin - # run: mkdir bin - # - name: cmake - # run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} .. - # working-directory: ./bin - # - name: make - # run: make -j - # working-directory: ./bin - # - name: ctest - # run: ctest -V -j - # working-directory: ./bin + which #{{matrix.vFortran}} + #{{matrix.vFortran}} --version + - uses: actions/checkout@v2 + - name: mkdir bin + run: mkdir bin + - name: cmake + run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} .. + working-directory: ./bin + - name: make + run: make -j + working-directory: ./bin + - name: ctest + run: ctest -V -j + working-directory: ./bin From c94cdb02f6d84059a5097d16a0d741fb701a3c08 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 08:52:57 -0600 Subject: [PATCH 46/59] Oops --- .github/workflows/ContinuousIntegration.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 4f6d8f25..f138f190 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -15,7 +15,8 @@ jobs: matrix: os: [ubuntu-18.04, macos-10.15] build_type: [ Debug, Release ] - vFortran: gfortran-8 + env: + vFortran: gfortran-8 # include: # - os: ubuntu-latest # vFortran: gfortran-8 From 35a963120c70e1fe4bfac4e6b717f0a6cc2ca5b5 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 08:53:31 -0600 Subject: [PATCH 47/59] I guess you can't do that --- .github/workflows/ContinuousIntegration.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index f138f190..eb2b0a69 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -15,13 +15,11 @@ jobs: matrix: os: [ubuntu-18.04, macos-10.15] build_type: [ Debug, Release ] - env: + include: + - os: ubuntu-latest + vFortran: gfortran-8 + - os: macos-latest vFortran: gfortran-8 - # include: - # - os: ubuntu-latest - # vFortran: gfortran-8 - # - os: macos-latest - # vFortran: gfortran-8 steps: - name: compgen From ca8bb99908c6ff5bb979d79d79c00a29a5b4e3e1 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 09:07:49 -0600 Subject: [PATCH 48/59] Don't know why that didn't work. --- .github/workflows/ContinuousIntegration.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index eb2b0a69..6f745739 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -24,10 +24,10 @@ jobs: steps: - name: compgen run: compgen -c | grep gfortran - - name: which gfortran - run: | - which #{{matrix.vFortran}} - #{{matrix.vFortran}} --version + #- name: which gfortran + # run: | + # which #{{matrix.vFortran}} + # #{{matrix.vFortran}} --version - uses: actions/checkout@v2 - name: mkdir bin run: mkdir bin From a7b951a3646c846e7536ea09558782a048eb4430 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 09:17:25 -0600 Subject: [PATCH 49/59] Moving definition of vFortran. --- .github/workflows/ContinuousIntegration.yml | 42 ++++++++++----------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 6f745739..40ae0335 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -9,34 +9,30 @@ on: branches: '*' jobs: + env: + vFortran: gfortran-8 build: runs-on: ${{matrix.os}} strategy: matrix: os: [ubuntu-18.04, macos-10.15] build_type: [ Debug, Release ] - include: - - os: ubuntu-latest - vFortran: gfortran-8 - - os: macos-latest - vFortran: gfortran-8 steps: - - name: compgen - run: compgen -c | grep gfortran - #- name: which gfortran - # run: | - # which #{{matrix.vFortran}} - # #{{matrix.vFortran}} --version - - uses: actions/checkout@v2 - - name: mkdir bin - run: mkdir bin - - name: cmake - run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} .. - working-directory: ./bin - - name: make - run: make -j - working-directory: ./bin - - name: ctest - run: ctest -V -j - working-directory: ./bin + + - name: which gfortran + run: | + which #{{env.vFortran}} + #{{env.vFortran}} --version + - uses: actions/checkout@v2 + - name: mkdir bin + run: mkdir bin + - name: cmake + run: cmake -D CMAKE_Fortran_COMPILER=`which ${{env.vFortran}}` -D CMAKE_BUILD_TYPE=${{env.build_type}} .. + working-directory: ./bin + - name: make + run: make -j + working-directory: ./bin + - name: ctest + run: ctest -V -j + working-directory: ./bin From a2d6d371885cf424c5b5fd124e2f5c30917b5c1a Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 09:18:08 -0600 Subject: [PATCH 50/59] Moving definition of vFortran. --- .github/workflows/ContinuousIntegration.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 40ae0335..76e4ebbb 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -8,9 +8,10 @@ on: pull_request: branches: '*' +env: + vFortran: gfortran-8 + jobs: - env: - vFortran: gfortran-8 build: runs-on: ${{matrix.os}} strategy: @@ -19,7 +20,6 @@ jobs: build_type: [ Debug, Release ] steps: - - name: which gfortran run: | which #{{env.vFortran}} From fb66e36c716fa68506081f4be1c2ae205b731ce1 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 09:19:05 -0600 Subject: [PATCH 51/59] Trying again. --- .github/workflows/ContinuousIntegration.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 76e4ebbb..9b0acf2a 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -22,13 +22,13 @@ jobs: steps: - name: which gfortran run: | - which #{{env.vFortran}} - #{{env.vFortran}} --version + which #{{vFortran}} + #{{vFortran}} --version - uses: actions/checkout@v2 - name: mkdir bin run: mkdir bin - name: cmake - run: cmake -D CMAKE_Fortran_COMPILER=`which ${{env.vFortran}}` -D CMAKE_BUILD_TYPE=${{env.build_type}} .. + run: cmake -D CMAKE_Fortran_COMPILER=`which ${{vFortran}}` -D CMAKE_BUILD_TYPE=${{env.build_type}} .. working-directory: ./bin - name: make run: make -j From 8d924b0e843f8927cd4ab8258581f7435b1c6b4a Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 09:22:03 -0600 Subject: [PATCH 52/59] Moving vFortran once again. --- .github/workflows/ContinuousIntegration.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 9b0acf2a..e9c8d9ce 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -8,9 +8,6 @@ on: pull_request: branches: '*' -env: - vFortran: gfortran-8 - jobs: build: runs-on: ${{matrix.os}} @@ -18,17 +15,18 @@ jobs: matrix: os: [ubuntu-18.04, macos-10.15] build_type: [ Debug, Release ] + vFortran: gfortran-8 steps: - name: which gfortran run: | - which #{{vFortran}} - #{{vFortran}} --version + which #{{matrix.vFortran}} + #{{matrix.vFortran}} --version - uses: actions/checkout@v2 - name: mkdir bin run: mkdir bin - name: cmake - run: cmake -D CMAKE_Fortran_COMPILER=`which ${{vFortran}}` -D CMAKE_BUILD_TYPE=${{env.build_type}} .. + run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} .. working-directory: ./bin - name: make run: make -j From 9621e32ad7f31858fb62251f0290184e7175ab06 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 09:23:14 -0600 Subject: [PATCH 53/59] vFortran is now array --- .github/workflows/ContinuousIntegration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index e9c8d9ce..62bcc493 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -15,7 +15,7 @@ jobs: matrix: os: [ubuntu-18.04, macos-10.15] build_type: [ Debug, Release ] - vFortran: gfortran-8 + vFortran: [ gfortran-8 ] steps: - name: which gfortran From 4a1e56f6275f7e03c474b50c89c5760d64fe8ef3 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 09:24:01 -0600 Subject: [PATCH 54/59] I'm stupid --- .github/workflows/ContinuousIntegration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 62bcc493..f5f6bc2c 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -20,8 +20,8 @@ jobs: steps: - name: which gfortran run: | - which #{{matrix.vFortran}} - #{{matrix.vFortran}} --version + which ${{matrix.vFortran}} + ${{matrix.vFortran}} --version - uses: actions/checkout@v2 - name: mkdir bin run: mkdir bin From 3af145875c3e0c24d7dee98589402aa7034bc7e1 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 10:06:14 -0600 Subject: [PATCH 55/59] Removing verbose testing. --- .github/workflows/ContinuousIntegration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index f5f6bc2c..9d312ce2 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -32,5 +32,5 @@ jobs: run: make -j working-directory: ./bin - name: ctest - run: ctest -V -j + run: ctest -j working-directory: ./bin From 1420ec830d139a6f92627d4e122f5f2587ac9268 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 10:19:01 -0600 Subject: [PATCH 56/59] Getting ready to test for Pull Requests. --- .github/workflows/ContinuousIntegration.yml | 26 ++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 9d312ce2..cacc767d 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -23,14 +23,18 @@ jobs: which ${{matrix.vFortran}} ${{matrix.vFortran}} --version - uses: actions/checkout@v2 - - name: mkdir bin - run: mkdir bin - - name: cmake - run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} .. - working-directory: ./bin - - name: make - run: make -j - working-directory: ./bin - - name: ctest - run: ctest -j - working-directory: ./bin + - name: git status + run: | + git status + git log + # - name: mkdir bin + # run: mkdir bin + # - name: cmake + # run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} .. + # working-directory: ./bin + # - name: make + # run: make -j + # working-directory: ./bin + # - name: ctest + # run: ctest -j + # working-directory: ./bin From b694bcff9fd3262386eed96fab81bcf585d66ab0 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 10:27:54 -0600 Subject: [PATCH 57/59] Simplifying 'on' --- .github/workflows/ContinuousIntegration.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index cacc767d..4e58a691 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -2,11 +2,7 @@ name: Continuous Integration # This workflow is triggered on pushes to the repository. -on: - push: - branches: '*' - pull_request: - branches: '*' +on: [ push, pull_request ] jobs: build: From 654d8787dc70b84b54b631ff82a6a064eb5bc8bb Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 10:31:08 -0600 Subject: [PATCH 58/59] Another simplification. --- .github/workflows/ContinuousIntegration.yml | 28 +++++++++------------ 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index 4e58a691..d7a98599 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -1,7 +1,7 @@ # GitHub workflow to enable continuous integratoin name: Continuous Integration -# This workflow is triggered on pushes to the repository. +# This workflow is triggered on pushes and pull requests to the repository. on: [ push, pull_request ] jobs: @@ -19,18 +19,14 @@ jobs: which ${{matrix.vFortran}} ${{matrix.vFortran}} --version - uses: actions/checkout@v2 - - name: git status - run: | - git status - git log - # - name: mkdir bin - # run: mkdir bin - # - name: cmake - # run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} .. - # working-directory: ./bin - # - name: make - # run: make -j - # working-directory: ./bin - # - name: ctest - # run: ctest -j - # working-directory: ./bin + - name: mkdir bin + run: mkdir bin + - name: cmake + run: cmake -D CMAKE_Fortran_COMPILER=`which ${{matrix.vFortran}}` -D CMAKE_BUILD_TYPE=${{matrix.build_type}} .. + working-directory: ./bin + - name: make + run: make -j + working-directory: ./bin + - name: ctest + run: ctest -j + working-directory: ./bin From aa964a4bf696a7a4ffede79941f026c27fd61dbc Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 2 Apr 2020 12:39:38 -0600 Subject: [PATCH 59/59] Limiting pull requests tests to master only. --- .github/workflows/ContinuousIntegration.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index d7a98599..7b57efa7 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -2,7 +2,11 @@ name: Continuous Integration # This workflow is triggered on pushes and pull requests to the repository. -on: [ push, pull_request ] +on: + push: + branches: '*' + pull_request: + branches: 'master' jobs: build: