From a09173147347616b5b04296ae60013e5b0cc9dca Mon Sep 17 00:00:00 2001 From: wangeguo Date: Thu, 29 Feb 2024 05:12:57 +0000 Subject: [PATCH] Bump pipeline from 1.34.0 to 1.36.6 Bumps pipeline from 1.34.0 to 1.36.6. Signed-off-by: GitHub --- .github/pipeline-version | 2 +- .github/workflows/pb-create-package.yml | 57 +++++-------------- .github/workflows/pb-minimal-labels.yml | 4 +- .github/workflows/pb-synchronize-labels.yml | 2 +- .github/workflows/pb-tests.yml | 40 ++++--------- .github/workflows/pb-update-draft-release.yml | 2 +- .github/workflows/pb-update-go.yml | 6 +- .github/workflows/pb-update-pipeline.yml | 6 +- 8 files changed, 36 insertions(+), 83 deletions(-) diff --git a/.github/pipeline-version b/.github/pipeline-version index 2b17ffd..f5b8b23 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.34.0 +1.36.6 diff --git a/.github/workflows/pb-create-package.yml b/.github/workflows/pb-create-package.yml index 69de5b1..b7675d6 100644 --- a/.github/workflows/pb-create-package.yml +++ b/.github/workflows/pb-create-package.yml @@ -11,12 +11,12 @@ jobs: steps: - name: Docker login ghcr.io if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }} - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: password: ${{ secrets.AMP_BUILDPACKS_BOT_GITHUB_TOKEN }} registry: ghcr.io username: ${{ github.actor }} - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: "1.20" - name: Install create-package @@ -26,44 +26,13 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/create-package@latest - - name: Install crane - run: | - #!/usr/bin/env bash - - set -euo pipefail - - echo "Installing crane ${CRANE_VERSION}" - - mkdir -p "${HOME}"/bin - echo "${HOME}/bin" >> "${GITHUB_PATH}" - - curl \ - --show-error \ - --silent \ - --location \ - "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 - - name: Install pack - run: | - #!/usr/bin/env bash - - set -euo pipefail - - echo "Installing pack ${PACK_VERSION}" - - mkdir -p "${HOME}"/bin - echo "${HOME}/bin" >> "${GITHUB_PATH}" - - curl \ - --location \ - --show-error \ - --silent \ - "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 + - uses: buildpacks/github-actions/setup-tools@v5.5.3 + with: + crane-version: 0.19.0 + yj-version: 5.1.0 + - uses: buildpacks/github-actions/setup-pack@v5.5.3 + with: + pack-version: 0.33.2 - name: Enable pack Experimental if: ${{ false }} run: | @@ -75,9 +44,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: |- @@ -91,8 +60,8 @@ jobs: set -euo pipefail - if [ -z "${GITHUB_REF+set}" ]; then - echo "GITHUB_REF set to [${GITHUB_REF-}], but should never be empty or unset" + if [[ ${GITHUB_REF:-} != "refs/"* ]]; then + echo "GITHUB_REF set to [${GITHUB_REF:-}], but that is unexpected. It should start with 'refs/*'" exit 255 fi diff --git a/.github/workflows/pb-minimal-labels.yml b/.github/workflows/pb-minimal-labels.yml index 75ea2ac..767ff02 100644 --- a/.github/workflows/pb-minimal-labels.yml +++ b/.github/workflows/pb-minimal-labels.yml @@ -12,7 +12,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: mheap/github-action-required-labels@v4 + - uses: mheap/github-action-required-labels@v5 with: count: 1 labels: semver:major, semver:minor, semver:patch @@ -22,7 +22,7 @@ jobs: runs-on: - ubuntu-latest steps: - - uses: mheap/github-action-required-labels@v4 + - uses: mheap/github-action-required-labels@v5 with: count: 1 labels: type:bug, type:dependency-upgrade, type:documentation, type:enhancement, type:question, type:task diff --git a/.github/workflows/pb-synchronize-labels.yml b/.github/workflows/pb-synchronize-labels.yml index dbedc76..9f837d4 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.AMP_BUILDPACKS_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/pb-tests.yml b/.github/workflows/pb-tests.yml index 92a9eb0..e8b0854 100644 --- a/.github/workflows/pb-tests.yml +++ b/.github/workflows/pb-tests.yml @@ -17,12 +17,12 @@ jobs: steps: - name: Docker login ghcr.io if: ${{ (github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork) && (github.actor != 'dependabot[bot]') }} - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: password: ${{ secrets.AMP_BUILDPACKS_BOT_GITHUB_TOKEN }} registry: ghcr.io username: ${{ github.actor }} - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: "1.20" - name: Install create-package @@ -32,25 +32,9 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/create-package@latest - - name: Install pack - run: | - #!/usr/bin/env bash - - set -euo pipefail - - echo "Installing pack ${PACK_VERSION}" - - mkdir -p "${HOME}"/bin - echo "${HOME}/bin" >> "${GITHUB_PATH}" - - curl \ - --location \ - --show-error \ - --silent \ - "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 + - uses: buildpacks/github-actions/setup-pack@v5.5.3 + with: + pack-version: 0.33.2 - name: Enable pack Experimental if: ${{ false }} run: | @@ -62,8 +46,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: |- @@ -77,8 +61,8 @@ jobs: set -euo pipefail - if [ -z "${GITHUB_REF+set}" ]; then - echo "GITHUB_REF set to [${GITHUB_REF-}], but should never be empty or unset" + if [[ ${GITHUB_REF:-} != "refs/"* ]]; then + echo "GITHUB_REF set to [${GITHUB_REF:-}], but that is unexpected. It should start with 'refs/*'" exit 255 fi @@ -187,13 +171,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 3c1ef46..461d304 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.AMP_BUILDPACKS_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 bcde158..a4d6274 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: | @@ -50,7 +50,7 @@ jobs: echo "commit-semver=${COMMIT_SEMVER}" >> "$GITHUB_OUTPUT" env: GO_VERSION: "1.20" - - uses: peter-evans/create-pull-request@v5 + - uses: peter-evans/create-pull-request@v6 with: author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> body: |- diff --git a/.github/workflows/pb-update-pipeline.yml b/.github/workflows/pb-update-pipeline.yml index fc2fe65..936108e 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: | @@ -65,7 +65,7 @@ jobs: env: DESCRIPTOR: .github/pipeline-descriptor.yml GITHUB_TOKEN: ${{ secrets.AMP_BUILDPACKS_BOT_GITHUB_TOKEN }} - - uses: peter-evans/create-pull-request@v5 + - uses: peter-evans/create-pull-request@v6 with: author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> body: |-