Merge pull request #1172 from mcneilco/release/2024.2.x

⬆️ Upmerge release/2024.2.x to release/2024.3.x
mcneilco · Jun 7, 2024 · 9149676 · 9149676
2 parents 09178c1 + 898047b
commit 9149676
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -12,22 +12,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           # list of Docker images to use as base name for tags
           images: |
             ${{ github.repository }}-oss
       - name: Set ACAS_TAG to ${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
         run: echo "ACAS_TAG=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}" >> $GITHUB_ENV
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -54,7 +54,7 @@ jobs:
           echo "ACAS_CLIENT_REF=main" >> $GITHUB_ENV
         if: github.ref == 'refs/heads/master'
       - name: Checkout acasclient
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: mcneilco/acasclient
           path: acasclient
@@ -101,7 +101,7 @@ jobs:
           echo "password=secret" >> ~/.acas/credentials
           echo "url=http://localhost:3000" >> ~/.acas/credentials
       - name: Set Up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
       - name: Display Python version

diff --git a/.github/workflows/tagger.yml b/.github/workflows/tagger.yml
@@ -30,7 +30,7 @@ jobs:
             echo "ACAS_REF=$(echo $INPUT_BRANCH_NAME)" >> $GITHUB_ENV
           fi 
       - name: Get the latest commit of ${{ env.ACAS_REF }} and apply tag ${{ github.event.inputs.tag-name }}
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.ACAS_WORKFLOWS_TOKEN }}
           script: |

diff --git a/.github/workflows/trigger-tag.yml b/.github/workflows/trigger-tag.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       # Checkout this repo
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       # Get branch name
@@ -28,7 +28,7 @@ jobs:
           echo "NEXT_TAG=$(echo $LAST_TAG | awk -F-dev -v OFS=-dev '{$NF += 1 ; print}')" >> $GITHUB_ENV
       # Trigger the build
       - name: Trigger the tagger workflow with branch ${{env.BRANCH_NAME}} and tag ${{ env.NEXT_TAG }}
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.ACAS_WORKFLOWS_TOKEN }}
           script: |

diff --git a/.github/workflows/upmerge.yml b/.github/workflows/upmerge.yml
@@ -21,7 +21,7 @@ jobs:
         owner: [ mcneilco ]
     steps:
       - name: Create pull requests to upmerge branches to main
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.ACAS_WORKFLOWS_TOKEN }}
           script: |