From d8fd95a3e7022f0dcf24abf880fd8cc6400dedec Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Wed, 13 Jul 2022 12:18:25 -0400 Subject: [PATCH] Fixes update bug with rustup-init The dependency id was not correct in pipeline-descriptor, thus updates were being detected but not reflected into buildpack.toml. This change syncs up pipeline-descriptor.yml with the id names in buildpack.toml. After this completes, we need to run the two update jobs as there are pending updates we are missing. Signed-off-by: Daniel Mikusa --- .github/pipeline-descriptor.yml | 6 +++--- .github/workflows/create-package.yml | 2 +- ...e-rustup-gnu.yml => update-rustup-init-gnu.yml} | 14 +++++++------- ...rustup-musl.yml => update-rustup-init-musl.yml} | 14 +++++++------- 4 files changed, 18 insertions(+), 18 deletions(-) rename .github/workflows/{update-rustup-gnu.yml => update-rustup-init-gnu.yml} (85%) rename .github/workflows/{update-rustup-musl.yml => update-rustup-init-musl.yml} (85%) diff --git a/.github/pipeline-descriptor.yml b/.github/pipeline-descriptor.yml index dec2a29..d4f70c5 100644 --- a/.github/pipeline-descriptor.yml +++ b/.github/pipeline-descriptor.yml @@ -17,13 +17,13 @@ docker_credentials: password: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }} dependencies: -- id: rustup-gnu +- id: rustup-init-gnu uses: docker://ghcr.io/paketo-buildpacks/actions/rustup-init-dependency:main with: target: x86_64-unknown-linux-gnu token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} -- id: rustup-musl +- id: rustup-init-musl uses: docker://ghcr.io/paketo-buildpacks/actions/rustup-init-dependency:main with: target: x86_64-unknown-linux-musl - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} \ No newline at end of file + token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/create-package.yml b/.github/workflows/create-package.yml index 5548711..bee6060 100644 --- a/.github/workflows/create-package.yml +++ b/.github/workflows/create-package.yml @@ -44,7 +44,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.10.0 + CRANE_VERSION: 0.8.0 - name: Install pack run: | #!/usr/bin/env bash diff --git a/.github/workflows/update-rustup-gnu.yml b/.github/workflows/update-rustup-init-gnu.yml similarity index 85% rename from .github/workflows/update-rustup-gnu.yml rename to .github/workflows/update-rustup-init-gnu.yml index 4794169..4cab0ff 100644 --- a/.github/workflows/update-rustup-gnu.yml +++ b/.github/workflows/update-rustup-init-gnu.yml @@ -1,4 +1,4 @@ -name: Update rustup-gnu +name: Update rustup-init-gnu "on": schedule: - cron: 0 5 * * 1-5 @@ -88,7 +88,7 @@ jobs: env: CPE: ${{ steps.dependency.outputs.cpe }} CPE_PATTERN: "" - ID: rustup-gnu + ID: rustup-init-gnu PURL: ${{ steps.dependency.outputs.purl }} PURL_PATTERN: "" SHA256: ${{ steps.dependency.outputs.sha256 }} @@ -98,14 +98,14 @@ jobs: - uses: peter-evans/create-pull-request@v4 with: author: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }} <${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}@users.noreply.github.com> - body: Bumps `rustup-gnu` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. - branch: update/buildpack/rustup-gnu + body: Bumps `rustup-init-gnu` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. + branch: update/buildpack/rustup-init-gnu commit-message: |- - Bump rustup-gnu from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + Bump rustup-init-gnu from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} - Bumps rustup-gnu from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}. + Bumps rustup-init-gnu from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}. delete-branch: true labels: ${{ steps.buildpack.outputs.version-label }}, type:dependency-upgrade signoff: true - title: Bump rustup-gnu from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + title: Bump rustup-init-gnu from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/update-rustup-musl.yml b/.github/workflows/update-rustup-init-musl.yml similarity index 85% rename from .github/workflows/update-rustup-musl.yml rename to .github/workflows/update-rustup-init-musl.yml index 460a9b6..2fe9534 100644 --- a/.github/workflows/update-rustup-musl.yml +++ b/.github/workflows/update-rustup-init-musl.yml @@ -1,4 +1,4 @@ -name: Update rustup-musl +name: Update rustup-init-musl "on": schedule: - cron: 0 5 * * 1-5 @@ -88,7 +88,7 @@ jobs: env: CPE: ${{ steps.dependency.outputs.cpe }} CPE_PATTERN: "" - ID: rustup-musl + ID: rustup-init-musl PURL: ${{ steps.dependency.outputs.purl }} PURL_PATTERN: "" SHA256: ${{ steps.dependency.outputs.sha256 }} @@ -98,14 +98,14 @@ jobs: - uses: peter-evans/create-pull-request@v4 with: author: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }} <${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_USERNAME }}@users.noreply.github.com> - body: Bumps `rustup-musl` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. - branch: update/buildpack/rustup-musl + body: Bumps `rustup-init-musl` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. + branch: update/buildpack/rustup-init-musl commit-message: |- - Bump rustup-musl from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + Bump rustup-init-musl from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} - Bumps rustup-musl from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}. + Bumps rustup-init-musl from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}. delete-branch: true labels: ${{ steps.buildpack.outputs.version-label }}, type:dependency-upgrade signoff: true - title: Bump rustup-musl from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + title: Bump rustup-init-musl from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}