Merge pull request #99 from British-Oceanographic-Data-Centre/feature…

…/635-gitactions update gitactions and python version on workflows
British-Oceanographic-Data-Centre · Nov 15, 2023 · 09f65ae · 09f65ae
2 parents febb445 + bdee135
commit 09f65ae
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 23 deletions.
diff --git a/.github/workflows/docstrings.yml b/.github/workflows/docstrings.yml
@@ -11,23 +11,23 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout site
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive # Fetch Hugo themes and all extra projects
           fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
           path: site
 
       - name: Checkout coast
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: British-Oceanographic-Data-Centre/COAsT
           ref: develop
           path: external
 
       - name: add python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.10
 
       - name: covert docstrings
         run: |
@@ -44,6 +44,7 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global author.email "[email protected]"
           git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
+          git fetch origin
           git checkout develop
           git pull
           [ ! -f content/en/docs/Reference/index.md ] || mv content/en/docs/Reference/index.md content/en/docs/Reference/index_class.md

diff --git a/.github/workflows/hugo.yml b/.github/workflows/hugo.yml
@@ -9,7 +9,7 @@ jobs:
   deploy:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive  # Fetch Hugo themes and all extra projects
           fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod
@@ -21,7 +21,7 @@ jobs:
           extended: true
 
       - name: Setup nodejs 
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: 12               
 

diff --git a/.github/workflows/markdown-altimetry.yml b/.github/workflows/markdown-altimetry.yml
@@ -14,14 +14,14 @@ jobs:
         shell: bash -l {0}
     steps:
       - name: Checkout site
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive # Fetch Hugo themes and all extra projects
           fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
           path: site
 
       - name: Checkout coast
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: British-Oceanographic-Data-Centre/COAsT
           ref: develop
@@ -32,7 +32,6 @@ jobs:
         with:
           activate-environment: coast
           environment-file: external/environment.yml
-          python-version: 3.8.10
       - name: prep exec notebooks
         run: |
           conda info
@@ -67,6 +66,7 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global author.email "[email protected]"
           git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
+          git fetch origin
           git checkout develop
           git pull        
           git add content/en/docs/Examples/Notebooks/Altimetry/*

diff --git a/.github/workflows/markdown-general.yml b/.github/workflows/markdown-general.yml
@@ -13,14 +13,14 @@ jobs:
         shell: bash -l {0}
     steps:
       - name: Checkout site
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive # Fetch Hugo themes and all extra projects
           fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
           path: site
 
       - name: Checkout coast
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: British-Oceanographic-Data-Centre/COAsT
           ref: develop
@@ -31,7 +31,6 @@ jobs:
         with:
           activate-environment: coast
           environment-file: external/environment.yml
-          python-version: 3.8.10
       - name: prep exec notebooks
         run: |
           conda info
@@ -69,8 +68,9 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global author.email "[email protected]"
           git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
+          git fetch origin
           git checkout develop
-          git pull        
+          git pull
           git add content/en/docs/Examples/Notebooks/General/*
           git add static/*
           git commit -am "Updated General notebook pages from coast repo."

diff --git a/.github/workflows/markdown-gridded.yml b/.github/workflows/markdown-gridded.yml
@@ -13,14 +13,14 @@ jobs:
         shell: bash -l {0}
     steps:
       - name: Checkout site
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive # Fetch Hugo themes and all extra projects
           fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
           path: site
 
       - name: Checkout coast
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: British-Oceanographic-Data-Centre/COAsT
           ref: develop
@@ -31,7 +31,6 @@ jobs:
         with:
           activate-environment: coast
           environment-file: external/environment.yml
-          python-version: 3.8.10
       - name: prep exec notebooks
         run: |
           conda info
@@ -71,8 +70,9 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global author.email "[email protected]"
           git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
+          git fetch origin
           git checkout develop
-          git pull        
+          git pull
           git add content/en/docs/Examples/Notebooks/Gridded/*
           git add static/*
           git commit -am "Updated Gridded notebook pages from coast repo."

diff --git a/.github/workflows/markdown-profile.yml b/.github/workflows/markdown-profile.yml
@@ -13,14 +13,14 @@ jobs:
         shell: bash -l {0}
     steps:
       - name: Checkout site
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive # Fetch Hugo themes and all extra projects
           fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
           path: site
 
       - name: Checkout coast
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: British-Oceanographic-Data-Centre/COAsT
           ref: develop
@@ -31,7 +31,6 @@ jobs:
         with:
           activate-environment: coast
           environment-file: external/environment.yml
-          python-version: 3.8.10
       - name: prep exec notebooks
         run: |
           conda info
@@ -64,6 +63,7 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global author.email "[email protected]"
           git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
+          git fetch origin
           git checkout develop
           git pull        
           git add content/en/docs/Examples/Notebooks/Profile/*

diff --git a/.github/workflows/markdown-tidegauge.yml b/.github/workflows/markdown-tidegauge.yml
@@ -13,14 +13,14 @@ jobs:
         shell: bash -l {0}
     steps:
       - name: Checkout site
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive # Fetch Hugo themes and all extra projects
           fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
           path: site
 
       - name: Checkout coast
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: British-Oceanographic-Data-Centre/COAsT
           ref: develop
@@ -31,7 +31,6 @@ jobs:
         with:
           activate-environment: coast
           environment-file: external/environment.yml
-          python-version: 3.8.10
       - name: prep exec notebooks
         run: |
           conda info
@@ -67,6 +66,7 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global author.email "[email protected]"
           git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
+          git fetch origin
           git checkout develop
           git pull        
           git add content/en/docs/Examples/Notebooks/Tidegauge/*