fix: merge conflicts

github · Dec 2, 2024 · 9071c5e · 9071c5e
2 parents 6399f02 + 5de21e1
commit 9071c5e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/.github/linters/.python-lint b/.github/linters/.python-lint
@@ -440,6 +440,7 @@ disable=bad-inline-option,
         too-many-branches,
         too-many-locals,
         too-many-nested-blocks,
+        too-many-positional-arguments,
         too-many-statements,
         useless-suppression,
         use-symbolic-message-instead,

diff --git a/.github/workflows/major-version-updater.yml b/.github/workflows/major-version-updater.yml
@@ -25,9 +25,7 @@ jobs:
           tag=${GITHUB_REF/refs\/tags\//};
           version=${tag#v} ;
           major=${version%%.*} ;
-          echo "tag=${tag}" >> "$GITHUB_OUTPUT" ;
-          echo "version=${version}" >> "$GITHUB_OUTPUT" ;
-          echo "major=${major}" >> "$GITHUB_OUTPUT" ;
+          { echo "tag=${tag}"; echo "version=${version}"; echo "major=${major}"; } >> "$GITHUB_OUTPUT"
 
       - name: force update major tag
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -42,7 +42,7 @@ jobs:
         id: get_tag_name
         run: |
           short_tag=$(echo ${{ steps.release-drafter.outputs.tag_name }} | cut -d. -f1)
-          echo "SHORT_TAG=$short_tag" >> $GITHUB_OUTPUT
+          echo "SHORT_TAG=$short_tag" >> "$GITHUB_OUTPUT"
   create_action_images:
     needs: create_release
     runs-on: ubuntu-latest

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -42,6 +42,6 @@ jobs:
           path: results.sarif
           retention-days: 5
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
+        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/super-linter.yaml b/.github/workflows/super-linter.yaml
@@ -30,7 +30,7 @@ jobs:
         run: |
           pip install -r requirements.txt -r requirements-test.txt
       - name: Lint Code Base
-        uses: super-linter/super-linter@b92721f792f381cedc002ecdbb9847a15ece5bb8 # v7.1.0
+        uses: super-linter/super-linter@e1cb86b6e8d119f789513668b4b30bf17fe1efe4 # v7.2.0
         env:
           DEFAULT_BRANCH: main
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 #checkov:skip=CKV_DOCKER_2
 #checkov:skip=CKV_DOCKER_3
-FROM python:3.13.0-slim@sha256:751d8bece269ba9e672b3f2226050e7e6fb3f3da3408b5dcb5d415a054fcb061
+FROM python:3.13.0-slim@sha256:4efa69bf17cfbd83a9942e60e2642335c3b397448e00410063a0421f9727c4c4
 LABEL org.opencontainers.image.source https://github.com/github/evergreen
 
 WORKDIR /action/workspace