diff --git a/.github/pipeline-version b/.github/pipeline-version index f2fb3d7..f5b8b23 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.36.5 +1.36.6 diff --git a/.github/workflows/pb-create-package.yml b/.github/workflows/pb-create-package.yml index dfc02f5..ea85ac8 100644 --- a/.github/workflows/pb-create-package.yml +++ b/.github/workflows/pb-create-package.yml @@ -11,14 +11,14 @@ jobs: steps: - name: Docker login gcr.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.GCR_PUSH_BOT_JSON_KEY }} registry: gcr.io username: _json_key - name: Docker login docker.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.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }} registry: docker.io @@ -33,44 +33,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.18.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.32.1 + - 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: | @@ -98,8 +67,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-tests.yml b/.github/workflows/pb-tests.yml index 81cb48d..87e2e6e 100644 --- a/.github/workflows/pb-tests.yml +++ b/.github/workflows/pb-tests.yml @@ -25,25 +25,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.32.1 + - uses: buildpacks/github-actions/setup-pack@v5.5.3 + with: + pack-version: 0.33.2 - name: Enable pack Experimental if: ${{ false }} run: | @@ -70,8 +54,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-update-cargo.yml b/.github/workflows/pb-update-cargo.yml index f1d0a3f..f5158bf 100644 --- a/.github/workflows/pb-update-cargo.yml +++ b/.github/workflows/pb-update-cargo.yml @@ -11,14 +11,14 @@ jobs: steps: - name: Docker login gcr.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.GCR_PUSH_BOT_JSON_KEY }} registry: gcr.io username: _json_key - name: Docker login docker.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.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }} registry: docker.io @@ -33,46 +33,10 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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.18.0 - - name: Install yj - run: | - #!/usr/bin/env bash - - set -euo pipefail - - echo "Installing yj ${YJ_VERSION}" - - mkdir -p "${HOME}"/bin - echo "${HOME}/bin" >> "${GITHUB_PATH}" - - curl \ - --location \ - --show-error \ - --silent \ - --output "${HOME}"/bin/yj \ - "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux-amd64" - - chmod +x "${HOME}"/bin/yj - env: - YJ_VERSION: 5.1.0 + - uses: buildpacks/github-actions/setup-tools@v5.5.3 + with: + crane-version: 0.19.0 + yj-version: 5.1.0 - uses: actions/checkout@v4 - name: Update Package Dependency id: package @@ -126,7 +90,7 @@ jobs: env: BP_DEPENDENCY: docker.io/paketo-community/cargo DEPENDENCY: docker.io/paketocommunity/cargo - - uses: peter-evans/create-pull-request@v5 + - uses: peter-evans/create-pull-request@v6 with: author: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }} <${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`docker.io/paketocommunity/cargo`](https://docker.io/paketocommunity/cargo) from [`${{ steps.package.outputs.old-version }}`](https://docker.io/paketocommunity/cargo:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://docker.io/paketocommunity/cargo:${{ steps.package.outputs.new-version }}). diff --git a/.github/workflows/pb-update-draft-release.yml b/.github/workflows/pb-update-draft-release.yml index 0d92e27..2efd977 100644 --- a/.github/workflows/pb-update-draft-release.yml +++ b/.github/workflows/pb-update-draft-release.yml @@ -15,14 +15,14 @@ jobs: GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - name: Docker login gcr.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.GCR_PUSH_BOT_JSON_KEY }} registry: gcr.io username: _json_key - name: Docker login docker.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.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }} registry: docker.io diff --git a/.github/workflows/pb-update-pipeline.yml b/.github/workflows/pb-update-pipeline.yml index ffc4930..b4d4fff 100644 --- a/.github/workflows/pb-update-pipeline.yml +++ b/.github/workflows/pb-update-pipeline.yml @@ -65,7 +65,7 @@ jobs: env: DESCRIPTOR: .github/pipeline-descriptor.yml GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - - uses: peter-evans/create-pull-request@v5 + - uses: peter-evans/create-pull-request@v6 with: author: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }} <${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}@users.noreply.github.com> body: |- diff --git a/.github/workflows/pb-update-procfile.yml b/.github/workflows/pb-update-procfile.yml index 0bae6ab..dc29abc 100644 --- a/.github/workflows/pb-update-procfile.yml +++ b/.github/workflows/pb-update-procfile.yml @@ -11,14 +11,14 @@ jobs: steps: - name: Docker login gcr.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.GCR_PUSH_BOT_JSON_KEY }} registry: gcr.io username: _json_key - name: Docker login docker.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.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }} registry: docker.io @@ -33,46 +33,10 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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.18.0 - - name: Install yj - run: | - #!/usr/bin/env bash - - set -euo pipefail - - echo "Installing yj ${YJ_VERSION}" - - mkdir -p "${HOME}"/bin - echo "${HOME}/bin" >> "${GITHUB_PATH}" - - curl \ - --location \ - --show-error \ - --silent \ - --output "${HOME}"/bin/yj \ - "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux-amd64" - - chmod +x "${HOME}"/bin/yj - env: - YJ_VERSION: 5.1.0 + - uses: buildpacks/github-actions/setup-tools@v5.5.3 + with: + crane-version: 0.19.0 + yj-version: 5.1.0 - uses: actions/checkout@v4 - name: Update Package Dependency id: package @@ -126,7 +90,7 @@ jobs: env: BP_DEPENDENCY: docker.io/paketo-buildpacks/procfile DEPENDENCY: docker.io/paketobuildpacks/procfile - - uses: peter-evans/create-pull-request@v5 + - uses: peter-evans/create-pull-request@v6 with: author: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }} <${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`docker.io/paketobuildpacks/procfile`](https://docker.io/paketobuildpacks/procfile) from [`${{ steps.package.outputs.old-version }}`](https://docker.io/paketobuildpacks/procfile:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://docker.io/paketobuildpacks/procfile:${{ steps.package.outputs.new-version }}). diff --git a/.github/workflows/pb-update-rust-dist.yml b/.github/workflows/pb-update-rust-dist.yml index 6d6d7ca..7987784 100644 --- a/.github/workflows/pb-update-rust-dist.yml +++ b/.github/workflows/pb-update-rust-dist.yml @@ -11,14 +11,14 @@ jobs: steps: - name: Docker login gcr.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.GCR_PUSH_BOT_JSON_KEY }} registry: gcr.io username: _json_key - name: Docker login docker.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.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }} registry: docker.io @@ -33,46 +33,10 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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.18.0 - - name: Install yj - run: | - #!/usr/bin/env bash - - set -euo pipefail - - echo "Installing yj ${YJ_VERSION}" - - mkdir -p "${HOME}"/bin - echo "${HOME}/bin" >> "${GITHUB_PATH}" - - curl \ - --location \ - --show-error \ - --silent \ - --output "${HOME}"/bin/yj \ - "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux-amd64" - - chmod +x "${HOME}"/bin/yj - env: - YJ_VERSION: 5.1.0 + - uses: buildpacks/github-actions/setup-tools@v5.5.3 + with: + crane-version: 0.19.0 + yj-version: 5.1.0 - uses: actions/checkout@v4 - name: Update Package Dependency id: package @@ -126,7 +90,7 @@ jobs: env: BP_DEPENDENCY: docker.io/paketo-community/rust-dist DEPENDENCY: docker.io/paketocommunity/rust-dist - - uses: peter-evans/create-pull-request@v5 + - uses: peter-evans/create-pull-request@v6 with: author: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }} <${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`docker.io/paketocommunity/rust-dist`](https://docker.io/paketocommunity/rust-dist) from [`${{ steps.package.outputs.old-version }}`](https://docker.io/paketocommunity/rust-dist:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://docker.io/paketocommunity/rust-dist:${{ steps.package.outputs.new-version }}). diff --git a/.github/workflows/pb-update-rustup.yml b/.github/workflows/pb-update-rustup.yml index 9391002..bda1881 100644 --- a/.github/workflows/pb-update-rustup.yml +++ b/.github/workflows/pb-update-rustup.yml @@ -11,14 +11,14 @@ jobs: steps: - name: Docker login gcr.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.GCR_PUSH_BOT_JSON_KEY }} registry: gcr.io username: _json_key - name: Docker login docker.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.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }} registry: docker.io @@ -33,46 +33,10 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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.18.0 - - name: Install yj - run: | - #!/usr/bin/env bash - - set -euo pipefail - - echo "Installing yj ${YJ_VERSION}" - - mkdir -p "${HOME}"/bin - echo "${HOME}/bin" >> "${GITHUB_PATH}" - - curl \ - --location \ - --show-error \ - --silent \ - --output "${HOME}"/bin/yj \ - "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux-amd64" - - chmod +x "${HOME}"/bin/yj - env: - YJ_VERSION: 5.1.0 + - uses: buildpacks/github-actions/setup-tools@v5.5.3 + with: + crane-version: 0.19.0 + yj-version: 5.1.0 - uses: actions/checkout@v4 - name: Update Package Dependency id: package @@ -126,7 +90,7 @@ jobs: env: BP_DEPENDENCY: docker.io/paketo-community/rustup DEPENDENCY: docker.io/paketocommunity/rustup - - uses: peter-evans/create-pull-request@v5 + - uses: peter-evans/create-pull-request@v6 with: author: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }} <${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`docker.io/paketocommunity/rustup`](https://docker.io/paketocommunity/rustup) from [`${{ steps.package.outputs.old-version }}`](https://docker.io/paketocommunity/rustup:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://docker.io/paketocommunity/rustup:${{ steps.package.outputs.new-version }}). diff --git a/.github/workflows/pb-update-syft.yml b/.github/workflows/pb-update-syft.yml index 71981f3..303292f 100644 --- a/.github/workflows/pb-update-syft.yml +++ b/.github/workflows/pb-update-syft.yml @@ -11,14 +11,14 @@ jobs: steps: - name: Docker login gcr.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.GCR_PUSH_BOT_JSON_KEY }} registry: gcr.io username: _json_key - name: Docker login docker.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.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }} registry: docker.io @@ -33,46 +33,10 @@ jobs: set -euo pipefail go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency@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.18.0 - - name: Install yj - run: | - #!/usr/bin/env bash - - set -euo pipefail - - echo "Installing yj ${YJ_VERSION}" - - mkdir -p "${HOME}"/bin - echo "${HOME}/bin" >> "${GITHUB_PATH}" - - curl \ - --location \ - --show-error \ - --silent \ - --output "${HOME}"/bin/yj \ - "https://github.com/sclevine/yj/releases/download/v${YJ_VERSION}/yj-linux-amd64" - - chmod +x "${HOME}"/bin/yj - env: - YJ_VERSION: 5.1.0 + - uses: buildpacks/github-actions/setup-tools@v5.5.3 + with: + crane-version: 0.19.0 + yj-version: 5.1.0 - uses: actions/checkout@v4 - name: Update Package Dependency id: package @@ -126,7 +90,7 @@ jobs: env: BP_DEPENDENCY: docker.io/paketo-buildpacks/syft DEPENDENCY: docker.io/paketobuildpacks/syft - - uses: peter-evans/create-pull-request@v5 + - uses: peter-evans/create-pull-request@v6 with: author: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }} <${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}@users.noreply.github.com> body: Bumps [`docker.io/paketobuildpacks/syft`](https://docker.io/paketobuildpacks/syft) from [`${{ steps.package.outputs.old-version }}`](https://docker.io/paketobuildpacks/syft:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://docker.io/paketobuildpacks/syft:${{ steps.package.outputs.new-version }}).