diff --git a/.github/actions/docker-build-push/action.yml b/.github/actions/docker-build-push/action.yml index 80af09e9..1892c10c 100644 --- a/.github/actions/docker-build-push/action.yml +++ b/.github/actions/docker-build-push/action.yml @@ -30,17 +30,19 @@ outputs: tags: description: "The tags we built and pushed" value: ${{ steps.meta.outputs.tags }} + json: + description: "The tags JSON we built and pushed" + value: ${{ steps.meta.outputs.json }} runs: using: "composite" steps: - - uses: actions/checkout@v3 - 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: Docker meta id: meta - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v5 with: images: ${{ inputs.registry }}/${{ inputs.name }} tags: | @@ -52,7 +54,7 @@ runs: type=sha,format=long,prefix=sha- ${{ inputs.custom_tag }} - name: Login to ECR - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ${{ inputs.registry }} - name: Calculate Branch and Base Names @@ -60,7 +62,7 @@ runs: uses: chanzuckerberg/github-actions/.github/actions/get-github-ref-names@get-github-ref-names-v1.4.0 - name: Calculate Cache-From id: cache-from - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: script: | let cacheFrom = [ @@ -70,9 +72,8 @@ runs: .map(ref => `type=registry,ref=${{ inputs.registry }}/${{ inputs.name }}:branch-${ref}`).join('\r\n'); console.log(`Will use cached images from ${JSON.stringify(cacheFrom, null, 2)}`); core.setOutput("cacheFrom", cacheFrom); - - name: Build and push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: file: ${{ inputs.dockerfile }} context: ${{ inputs.context }} diff --git a/.github/actions/get-github-ref-names/action.yml b/.github/actions/get-github-ref-names/action.yml index 137232f0..91787ba1 100644 --- a/.github/actions/get-github-ref-names/action.yml +++ b/.github/actions/get-github-ref-names/action.yml @@ -19,7 +19,7 @@ runs: steps: - name: Calculate Refs id: refs - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: script: | let eventName = context.eventName; @@ -48,5 +48,4 @@ runs: core.setOutput("headRef", head); core.setOutput("baseRef", base); - console.log(`Calculated the following ${JSON.stringify({eventName,base,head}, null, 2)}`); -# bump3 + console.log(`Calculated the following ${JSON.stringify({eventName,base,head}, null, 2)}`); \ No newline at end of file