From 6260088eb5c896f57347cb4398c5d574657ec089 Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Fri, 19 Jan 2024 06:13:37 +0000 Subject: [PATCH] Bump pipeline from 1.34.0 to 1.36.2 Bumps pipeline from 1.34.0 to 1.36.2. Signed-off-by: GitHub --- .github/pipeline-version | 2 +- .github/workflows/pb-create-package.yml | 10 ++++----- .github/workflows/pb-synchronize-labels.yml | 2 +- .github/workflows/pb-tests.yml | 14 ++++++------- .github/workflows/pb-update-draft-release.yml | 2 +- .github/workflows/pb-update-go.yml | 4 ++-- .github/workflows/pb-update-pipeline.yml | 4 ++-- .github/workflows/pb-update-tomcat-10-1.yml | 21 +++++++++++-------- .github/workflows/pb-update-tomcat-10.yml | 21 +++++++++++-------- .github/workflows/pb-update-tomcat-8.yml | 21 +++++++++++-------- .github/workflows/pb-update-tomcat-9.yml | 21 +++++++++++-------- ...b-update-tomcat-access-logging-support.yml | 21 +++++++++++-------- .../pb-update-tomcat-lifecycle-support.yml | 21 +++++++++++-------- .../pb-update-tomcat-logging-support.yml | 21 +++++++++++-------- 14 files changed, 103 insertions(+), 82 deletions(-) diff --git a/.github/pipeline-version b/.github/pipeline-version index 2b17ffd..c6a567b 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.34.0 +1.36.2 diff --git a/.github/workflows/pb-create-package.yml b/.github/workflows/pb-create-package.yml index e9ad126..764c4a0 100644 --- a/.github/workflows/pb-create-package.yml +++ b/.github/workflows/pb-create-package.yml @@ -23,7 +23,7 @@ jobs: password: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }} registry: docker.io username: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }} - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: "1.20" - name: Install create-package @@ -51,7 +51,7 @@ jobs: "https://github.com/google/go-containerregistry/releases/download/v${CRANE_VERSION}/go-containerregistry_Linux_x86_64.tar.gz" \ | tar -C "${HOME}/bin" -xz crane env: - CRANE_VERSION: 0.8.0 + CRANE_VERSION: 0.18.0 - name: Install pack run: | #!/usr/bin/env bash @@ -70,7 +70,7 @@ jobs: "https://github.com/buildpacks/pack/releases/download/v${PACK_VERSION}/pack-v${PACK_VERSION}-linux.tgz" \ | tar -C "${HOME}"/bin -xz pack env: - PACK_VERSION: 0.29.0 + PACK_VERSION: 0.32.1 - name: Enable pack Experimental if: ${{ false }} run: | @@ -82,9 +82,9 @@ jobs: mkdir -p "${HOME}"/.pack echo "experimental = true" >> "${HOME}"/.pack/config.toml - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - if: ${{ false }} - uses: actions/cache@v3 + uses: actions/cache@v4 with: key: ${{ runner.os }}-go-${{ hashFiles('**/buildpack.toml', '**/package.toml') }} path: |- diff --git a/.github/workflows/pb-synchronize-labels.yml b/.github/workflows/pb-synchronize-labels.yml index 8f93206..21464b5 100644 --- a/.github/workflows/pb-synchronize-labels.yml +++ b/.github/workflows/pb-synchronize-labels.yml @@ -11,7 +11,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: micnncim/action-label-syncer@v1 env: GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml index 4649e5c..e3dacdc 100644 --- a/.github/workflows/pb-tests.yml +++ b/.github/workflows/pb-tests.yml @@ -15,7 +15,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: "1.20" - name: Install create-package @@ -43,7 +43,7 @@ jobs: "https://github.com/buildpacks/pack/releases/download/v${PACK_VERSION}/pack-v${PACK_VERSION}-linux.tgz" \ | tar -C "${HOME}"/bin -xz pack env: - PACK_VERSION: 0.29.0 + PACK_VERSION: 0.32.1 - name: Enable pack Experimental if: ${{ false }} run: | @@ -55,8 +55,8 @@ jobs: mkdir -p "${HOME}"/.pack echo "experimental = true" >> "${HOME}"/.pack/config.toml - - uses: actions/checkout@v3 - - uses: actions/cache@v3 + - uses: actions/checkout@v4 + - uses: actions/cache@v4 with: key: ${{ runner.os }}-go-${{ hashFiles('**/buildpack.toml', '**/package.toml') }} path: |- @@ -180,13 +180,13 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/cache@v3 + - uses: actions/checkout@v4 + - uses: actions/cache@v4 with: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} path: ${{ env.HOME }}/go/pkg/mod restore-keys: ${{ runner.os }}-go- - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: "1.20" - name: Install richgo diff --git a/.github/workflows/pb-update-draft-release.yml b/.github/workflows/pb-update-draft-release.yml index 2aae7bf..48e91ab 100644 --- a/.github/workflows/pb-update-draft-release.yml +++ b/.github/workflows/pb-update-draft-release.yml @@ -13,7 +13,7 @@ jobs: uses: release-drafter/release-drafter@v5 env: GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Update draft release with buildpack information uses: docker://ghcr.io/paketo-buildpacks/actions/draft-release:main with: diff --git a/.github/workflows/pb-update-go.yml b/.github/workflows/pb-update-go.yml index b8c6697..b78bab2 100644 --- a/.github/workflows/pb-update-go.yml +++ b/.github/workflows/pb-update-go.yml @@ -9,10 +9,10 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: "1.20" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Update Go Version & Modules id: update-go run: | diff --git a/.github/workflows/pb-update-pipeline.yml b/.github/workflows/pb-update-pipeline.yml index cfe2527..7b6277b 100644 --- a/.github/workflows/pb-update-pipeline.yml +++ b/.github/workflows/pb-update-pipeline.yml @@ -14,7 +14,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: "1.20" - name: Install octo @@ -24,7 +24,7 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/pipeline-builder/cmd/octo@latest - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Update Pipeline id: pipeline run: | diff --git a/.github/workflows/pb-update-tomcat-10-1.yml b/.github/workflows/pb-update-tomcat-10-1.yml index f38e9f2..2f1753c 100644 --- a/.github/workflows/pb-update-tomcat-10-1.yml +++ b/.github/workflows/pb-update-tomcat-10-1.yml @@ -9,7 +9,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: "1.20" - name: Install update-buildpack-dependency @@ -35,12 +35,12 @@ jobs: --show-error \ --silent \ --output "${HOME}"/bin/yj \ - "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux" + "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux-amd64" chmod +x "${HOME}"/bin/yj env: - YJ_VERSION: 5.0.0 - - uses: actions/checkout@v3 + YJ_VERSION: 5.1.0 + - uses: actions/checkout@v4 - id: dependency uses: docker://ghcr.io/paketo-buildpacks/actions/tomcat-dependency:main with: @@ -53,15 +53,17 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < buildpack.toml | jq -r " - .metadata.dependencies[] | - select( .id == env.ID ) | - select( .version | test( env.VERSION_PATTERN ) ) | - .version") + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + + OLD_VERSION=$(yj -tj < buildpack.toml | \ + jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) ) | .version") update-buildpack-dependency \ --buildpack-toml buildpack.toml \ --id "${ID}" \ + --arch "${ARCH}" \ --version-pattern "${VERSION_PATTERN}" \ --version "${VERSION}" \ --cpe-pattern "${CPE_PATTERN:-}" \ @@ -88,6 +90,7 @@ jobs: echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT" echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT" env: + ARCH: "" CPE: ${{ steps.dependency.outputs.cpe }} CPE_PATTERN: "" ID: tomcat diff --git a/.github/workflows/pb-update-tomcat-10.yml b/.github/workflows/pb-update-tomcat-10.yml index 9646c75..f2bfa16 100644 --- a/.github/workflows/pb-update-tomcat-10.yml +++ b/.github/workflows/pb-update-tomcat-10.yml @@ -9,7 +9,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: "1.20" - name: Install update-buildpack-dependency @@ -35,12 +35,12 @@ jobs: --show-error \ --silent \ --output "${HOME}"/bin/yj \ - "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux" + "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux-amd64" chmod +x "${HOME}"/bin/yj env: - YJ_VERSION: 5.0.0 - - uses: actions/checkout@v3 + YJ_VERSION: 5.1.0 + - uses: actions/checkout@v4 - id: dependency uses: docker://ghcr.io/paketo-buildpacks/actions/tomcat-dependency:main with: @@ -53,15 +53,17 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < buildpack.toml | jq -r " - .metadata.dependencies[] | - select( .id == env.ID ) | - select( .version | test( env.VERSION_PATTERN ) ) | - .version") + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + + OLD_VERSION=$(yj -tj < buildpack.toml | \ + jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) ) | .version") update-buildpack-dependency \ --buildpack-toml buildpack.toml \ --id "${ID}" \ + --arch "${ARCH}" \ --version-pattern "${VERSION_PATTERN}" \ --version "${VERSION}" \ --cpe-pattern "${CPE_PATTERN:-}" \ @@ -88,6 +90,7 @@ jobs: echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT" echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT" env: + ARCH: "" CPE: ${{ steps.dependency.outputs.cpe }} CPE_PATTERN: "" ID: tomcat diff --git a/.github/workflows/pb-update-tomcat-8.yml b/.github/workflows/pb-update-tomcat-8.yml index fe8dc4d..96865ab 100644 --- a/.github/workflows/pb-update-tomcat-8.yml +++ b/.github/workflows/pb-update-tomcat-8.yml @@ -9,7 +9,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: "1.20" - name: Install update-buildpack-dependency @@ -35,12 +35,12 @@ jobs: --show-error \ --silent \ --output "${HOME}"/bin/yj \ - "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux" + "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux-amd64" chmod +x "${HOME}"/bin/yj env: - YJ_VERSION: 5.0.0 - - uses: actions/checkout@v3 + YJ_VERSION: 5.1.0 + - uses: actions/checkout@v4 - id: dependency uses: docker://ghcr.io/paketo-buildpacks/actions/tomcat-dependency:main with: @@ -52,15 +52,17 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < buildpack.toml | jq -r " - .metadata.dependencies[] | - select( .id == env.ID ) | - select( .version | test( env.VERSION_PATTERN ) ) | - .version") + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + + OLD_VERSION=$(yj -tj < buildpack.toml | \ + jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) ) | .version") update-buildpack-dependency \ --buildpack-toml buildpack.toml \ --id "${ID}" \ + --arch "${ARCH}" \ --version-pattern "${VERSION_PATTERN}" \ --version "${VERSION}" \ --cpe-pattern "${CPE_PATTERN:-}" \ @@ -87,6 +89,7 @@ jobs: echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT" echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT" env: + ARCH: "" CPE: ${{ steps.dependency.outputs.cpe }} CPE_PATTERN: "" ID: tomcat diff --git a/.github/workflows/pb-update-tomcat-9.yml b/.github/workflows/pb-update-tomcat-9.yml index ac313f2..af26821 100644 --- a/.github/workflows/pb-update-tomcat-9.yml +++ b/.github/workflows/pb-update-tomcat-9.yml @@ -9,7 +9,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: "1.20" - name: Install update-buildpack-dependency @@ -35,12 +35,12 @@ jobs: --show-error \ --silent \ --output "${HOME}"/bin/yj \ - "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux" + "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux-amd64" chmod +x "${HOME}"/bin/yj env: - YJ_VERSION: 5.0.0 - - uses: actions/checkout@v3 + YJ_VERSION: 5.1.0 + - uses: actions/checkout@v4 - id: dependency uses: docker://ghcr.io/paketo-buildpacks/actions/tomcat-dependency:main with: @@ -52,15 +52,17 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < buildpack.toml | jq -r " - .metadata.dependencies[] | - select( .id == env.ID ) | - select( .version | test( env.VERSION_PATTERN ) ) | - .version") + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + + OLD_VERSION=$(yj -tj < buildpack.toml | \ + jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) ) | .version") update-buildpack-dependency \ --buildpack-toml buildpack.toml \ --id "${ID}" \ + --arch "${ARCH}" \ --version-pattern "${VERSION_PATTERN}" \ --version "${VERSION}" \ --cpe-pattern "${CPE_PATTERN:-}" \ @@ -87,6 +89,7 @@ jobs: echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT" echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT" env: + ARCH: "" CPE: ${{ steps.dependency.outputs.cpe }} CPE_PATTERN: "" ID: tomcat diff --git a/.github/workflows/pb-update-tomcat-access-logging-support.yml b/.github/workflows/pb-update-tomcat-access-logging-support.yml index cec89fe..6ded065 100644 --- a/.github/workflows/pb-update-tomcat-access-logging-support.yml +++ b/.github/workflows/pb-update-tomcat-access-logging-support.yml @@ -9,7 +9,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: "1.20" - name: Install update-buildpack-dependency @@ -35,12 +35,12 @@ jobs: --show-error \ --silent \ --output "${HOME}"/bin/yj \ - "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux" + "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux-amd64" chmod +x "${HOME}"/bin/yj env: - YJ_VERSION: 5.0.0 - - uses: actions/checkout@v3 + YJ_VERSION: 5.1.0 + - uses: actions/checkout@v4 - id: dependency uses: docker://ghcr.io/paketo-buildpacks/actions/maven-dependency:main with: @@ -56,15 +56,17 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < buildpack.toml | jq -r " - .metadata.dependencies[] | - select( .id == env.ID ) | - select( .version | test( env.VERSION_PATTERN ) ) | - .version") + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + + OLD_VERSION=$(yj -tj < buildpack.toml | \ + jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) ) | .version") update-buildpack-dependency \ --buildpack-toml buildpack.toml \ --id "${ID}" \ + --arch "${ARCH}" \ --version-pattern "${VERSION_PATTERN}" \ --version "${VERSION}" \ --cpe-pattern "${CPE_PATTERN:-}" \ @@ -91,6 +93,7 @@ jobs: echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT" echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT" env: + ARCH: "" CPE: ${{ steps.dependency.outputs.cpe }} CPE_PATTERN: "" ID: tomcat-access-logging-support diff --git a/.github/workflows/pb-update-tomcat-lifecycle-support.yml b/.github/workflows/pb-update-tomcat-lifecycle-support.yml index a066f57..42ccd49 100644 --- a/.github/workflows/pb-update-tomcat-lifecycle-support.yml +++ b/.github/workflows/pb-update-tomcat-lifecycle-support.yml @@ -9,7 +9,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: "1.20" - name: Install update-buildpack-dependency @@ -35,12 +35,12 @@ jobs: --show-error \ --silent \ --output "${HOME}"/bin/yj \ - "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux" + "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux-amd64" chmod +x "${HOME}"/bin/yj env: - YJ_VERSION: 5.0.0 - - uses: actions/checkout@v3 + YJ_VERSION: 5.1.0 + - uses: actions/checkout@v4 - id: dependency uses: docker://ghcr.io/paketo-buildpacks/actions/maven-dependency:main with: @@ -56,15 +56,17 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < buildpack.toml | jq -r " - .metadata.dependencies[] | - select( .id == env.ID ) | - select( .version | test( env.VERSION_PATTERN ) ) | - .version") + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + + OLD_VERSION=$(yj -tj < buildpack.toml | \ + jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) ) | .version") update-buildpack-dependency \ --buildpack-toml buildpack.toml \ --id "${ID}" \ + --arch "${ARCH}" \ --version-pattern "${VERSION_PATTERN}" \ --version "${VERSION}" \ --cpe-pattern "${CPE_PATTERN:-}" \ @@ -91,6 +93,7 @@ jobs: echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT" echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT" env: + ARCH: "" CPE: ${{ steps.dependency.outputs.cpe }} CPE_PATTERN: "" ID: tomcat-lifecycle-support diff --git a/.github/workflows/pb-update-tomcat-logging-support.yml b/.github/workflows/pb-update-tomcat-logging-support.yml index 8a331fa..c59d7d1 100644 --- a/.github/workflows/pb-update-tomcat-logging-support.yml +++ b/.github/workflows/pb-update-tomcat-logging-support.yml @@ -9,7 +9,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: "1.20" - name: Install update-buildpack-dependency @@ -35,12 +35,12 @@ jobs: --show-error \ --silent \ --output "${HOME}"/bin/yj \ - "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux" + "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux-amd64" chmod +x "${HOME}"/bin/yj env: - YJ_VERSION: 5.0.0 - - uses: actions/checkout@v3 + YJ_VERSION: 5.1.0 + - uses: actions/checkout@v4 - id: dependency uses: docker://ghcr.io/paketo-buildpacks/actions/maven-dependency:main with: @@ -56,15 +56,17 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < buildpack.toml | jq -r " - .metadata.dependencies[] | - select( .id == env.ID ) | - select( .version | test( env.VERSION_PATTERN ) ) | - .version") + if [ -z "${ARCH}" ]; then + ARCH="amd64" + fi + + OLD_VERSION=$(yj -tj < buildpack.toml | \ + jq -r ".metadata.dependencies[] | select( .id == env.ID ) | select( .version | test( env.VERSION_PATTERN ) ) | select( .purl | contains( env.ARCH ) ) | .version") update-buildpack-dependency \ --buildpack-toml buildpack.toml \ --id "${ID}" \ + --arch "${ARCH}" \ --version-pattern "${VERSION_PATTERN}" \ --version "${VERSION}" \ --cpe-pattern "${CPE_PATTERN:-}" \ @@ -91,6 +93,7 @@ jobs: echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT" echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT" env: + ARCH: "" CPE: ${{ steps.dependency.outputs.cpe }} CPE_PATTERN: "" ID: tomcat-logging-support