Merge branch 'master' into dependabot/maven/org.apache.maven.plugins-…

…maven-dependency-plugin-3.8.1
SaptarshiSarkar12 · Nov 20, 2024 · 65c64a9 · 65c64a9
2 parents be96fda + ddb4c88
commit 65c64a9
Show file tree

Hide file tree

Showing 7 changed files with 540 additions and 191 deletions.
diff --git a/.github/workflows/dev-docker-build.yml b/.github/workflows/dev-docker-build.yml
@@ -59,7 +59,7 @@ jobs:
           docker compose build ${{ matrix.image_name_suffix }}
       - name: Run Trivy security scan
         if: matrix.os == 'ubuntu-latest'
-        uses: aquasecurity/trivy-action@0.28.0
+        uses: aquasecurity/trivy-action@0.29.0
         continue-on-error: true
         with:
           image-ref: "drifty-${{ matrix.image_name_suffix }}"

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -137,7 +137,7 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v5.5.1
+        uses: docker/metadata-action@v5.6.1
         with:
           images: |
             ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ matrix.image_name }}
@@ -207,7 +207,7 @@ jobs:
         run: docker build -t ${{ matrix.image_name }} -f Docker/prod/${{ matrix.docker_context }}/Dockerfile build/${{ matrix.docker_context }}
 
       - name: Run Trivy security scan
-        uses: aquasecurity/trivy-action@0.28.0
+        uses: aquasecurity/trivy-action@0.29.0
         continue-on-error: true
         with:
           image-ref: ${{ matrix.image_name }}

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -46,6 +46,7 @@ jobs:
           VALIDATE_YAML: false
           VALIDATE_CHECKOV: false
           VALIDATE_SHELL_SHFMT: false
+          VALIDATE_GIT_MERGE_CONFLICT_MARKERS: false
       - name: Set read and write permission in super linter log
         run: sudo chmod 777 super-linter.log
       - name: Upload Lint Result

diff --git a/.github/workflows/nextjs.yml b/.github/workflows/nextjs.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: "latest"
+          node-version: "21.2.0"
           cache: ${{ steps.detect-package-manager.outputs.manager }}
           cache-dependency-path: "./Website/package-lock.json"
       - name: Setup Pages
@@ -88,4 +88,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v4