Merge branch 'ABTech:main' into sync-members

ABTech · Sep 15, 2024 · baa65b8 · baa65b8
2 parents efa6a38 + af3b87a
commit baa65b8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -24,10 +24,10 @@ jobs:
 #       CIVERSION: ${{ steps.push-image.outputs.CIVERSION }}
 #     steps:
 #       - name: Checkout
-#         uses: actions/checkout@v2
+#         uses: actions/checkout@v4
 #       - name: 🏗 Set up build cache
 #         id: cache
-#         uses: actions/cache@v2
+#         uses: actions/cache@v4
 #         with:
 #           path: /tmp/.docker-cache
 #           key: ${{ runner.os }}-buildDocker-${{ env.cache-name }}-${{ github.ref }}-${{ github.sha }}-${{ hashFiles('**/Dockerfile') }}
@@ -76,9 +76,9 @@ jobs:
       image: "ghcr.io/abtech/abtech.org:fefc2b479d4c22d6b3e00b1b359a5be2780d7fbe"
     steps:
       - name: Checkout latest
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       # - name: Cache Ruby dependencies
-      #   uses: actions/cache@v2
+      #   uses: actions/cache@v4
       #   env:
       #     cache-name: cache-ruby-gems
       #   with:
@@ -88,7 +88,7 @@ jobs:
       #       ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.ref }}-
       #       ${{ runner.os }}-build-${{ env.cache-name }}-
       # - name: Cache NodeJS dependencies
-      #   uses: actions/cache@v2
+      #   uses: actions/cache@v4
       #   env:
       #     cache-name: cache-node-modules
       #   with:
@@ -104,7 +104,7 @@ jobs:
       - name: Archive files
         run: tar -cvf _site.tar -C _site .
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: "_site.tar"
           path: _site.tar
@@ -118,15 +118,15 @@ jobs:
       github.event_name != 'pull_request'
     steps:
       - name: Checkout gh-pages branch of repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: "gh-pages"
       - name: Clear branch of previous build
         run: |
           git rm -rf . --ignore-unmatch
           git clean -fxd
       - name: Download built artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: "_site.tar"
       - name: 'Unarchive files & remove archive'
@@ -148,15 +148,15 @@ jobs:
       github.event_name != 'pull_request'
     steps:
       - name: Checkout gh-pages-dev branch of repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: "gh-pages-dev"
       - name: Clear branch of previous build
         run: |
           git rm -rf . --ignore-unmatch
           git clean -fxd
       - name: Download built artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: "_site.tar"
       - name: 'Unarchive files & remove archive'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -66,7 +66,7 @@ GEM
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.3.3)
+    rexml (3.3.6)
       strscan
     rouge (3.27.0)
     safe_yaml (1.0.5)