From 0a757711f40c81b0056c328b25d0502344d9fca8 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 7 Jul 2022 12:29:08 -0400 Subject: [PATCH 1/5] Fix GitHub Actions issue --- .github/workflows/workflow.yml | 4 ++-- CHANGELOG.md | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 393549ea6c2..e6285a3183c 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -34,7 +34,7 @@ jobs: with: access_token: ${{ github.token }} - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 1 - name: Versions etc. @@ -87,7 +87,7 @@ jobs: with: access_token: ${{ github.token }} - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 1 - name: Versions etc. diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b5b7b1d059..a7baa4b7706 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Moved to `checkout@v3` action due to git safe directory issue + ### Removed ### Deprecated From 7fa5c3f7150fb8a71fcab6d0126fcc900e58614a Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 7 Jul 2022 12:31:56 -0400 Subject: [PATCH 2/5] Make tests more recognizable --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index e6285a3183c..57c824d2819 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -14,7 +14,7 @@ on: jobs: build_test_mapl: - name: Build and Test MAPL + name: Build and Test MAPL GNU runs-on: ubuntu-latest container: image: gmao/ubuntu20-geos-env-mkl:v7.5.0-openmpi_4.1.2-gcc_11.2.0 From 389a2cdb36e76a2207a5109e68265663cb2bf461 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 7 Jul 2022 12:36:17 -0400 Subject: [PATCH 3/5] Add set-safe-directory --- .github/workflows/workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 57c824d2819..b62873ff319 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -37,6 +37,7 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 1 + set-safe-directory: $GITHUB_WORKSPACE - name: Versions etc. run: | gfortran --version From 77768660dbfbf8238163be62a2af75e2c072c79c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 7 Jul 2022 12:38:40 -0400 Subject: [PATCH 4/5] Undo last. Didn't work --- .github/workflows/workflow.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index b62873ff319..57c824d2819 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -37,7 +37,6 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 1 - set-safe-directory: $GITHUB_WORKSPACE - name: Versions etc. run: | gfortran --version From 309cd8f93df10d2f1bbc4ed82870dd9ec3713cd3 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 7 Jul 2022 12:40:34 -0400 Subject: [PATCH 5/5] Brute force it --- .github/workflows/workflow.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 57c824d2819..5314ec33dbd 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -37,6 +37,9 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 1 + - name: Set all directories as git safe + run: | + git config --global --add safe.directory '*' - name: Versions etc. run: | gfortran --version @@ -90,6 +93,9 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 1 + - name: Set all directories as git safe + run: | + git config --global --add safe.directory '*' - name: Versions etc. run: | ifort --version