From ec24ee7a4c981df30bcd51c59dd8d18a8e04664d Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Thu, 14 Oct 2021 20:43:18 +0000 Subject: [PATCH] Bump pipeline from 1.10.0 to 1.11.0 Bumps pipeline from 1.10.0 to 1.11.0. Signed-off-by: GitHub --- .github/labels.yml | 1 - .github/pipeline-version | 2 +- .github/workflows/create-package.yml | 20 +++--- .github/workflows/tests.yml | 23 +++---- .github/workflows/update-jdk-17.yml | 95 +++++++++++++++++++++++++++ .github/workflows/update-pipeline.yml | 4 +- 6 files changed, 116 insertions(+), 29 deletions(-) create mode 100644 .github/workflows/update-jdk-17.yml diff --git a/.github/labels.yml b/.github/labels.yml index 8836d46..270dd19 100644 --- a/.github/labels.yml +++ b/.github/labels.yml @@ -25,4 +25,3 @@ - name: type:task description: A general task color: e3d9fc - diff --git a/.github/pipeline-version b/.github/pipeline-version index 81c871d..1cac385 100644 --- a/.github/pipeline-version +++ b/.github/pipeline-version @@ -1 +1 @@ -1.10.0 +1.11.0 diff --git a/.github/workflows/create-package.yml b/.github/workflows/create-package.yml index 02e3402..9e6200c 100644 --- a/.github/workflows/create-package.yml +++ b/.github/workflows/create-package.yml @@ -9,8 +9,8 @@ jobs: runs-on: - ubuntu-latest steps: - - if: ${{ github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork }} - name: Docker login gcr.io + - 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@v1 with: password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} @@ -64,8 +64,8 @@ jobs: | tar -C "${HOME}"/bin -xz pack env: PACK_VERSION: 0.18.1 - - if: ${{ false }} - name: Enable pack Experimental + - name: Enable pack Experimental + if: ${{ false }} run: | #!/usr/bin/env bash @@ -84,8 +84,8 @@ jobs: ${{ env.HOME }}/.pack ${{ env.HOME }}/carton-cache restore-keys: ${{ runner.os }}-go- - - id: version - name: Compute Version + - name: Compute Version + id: version run: | #!/usr/bin/env bash @@ -128,15 +128,15 @@ jobs: INCLUDE_DEPENDENCIES: "false" OS: linux VERSION: ${{ steps.version.outputs.version }} - - id: package - name: Package Buildpack + - name: Package Buildpack + id: package run: | #!/usr/bin/env bash set -euo pipefail if [[ -n "${PUBLISH+x}" ]]; then - pack package-buildpack \ + pack buildpack package \ "${PACKAGE}:${VERSION}" \ --config "${HOME}"/package.toml \ --publish @@ -144,7 +144,7 @@ jobs: crane tag "${PACKAGE}:${VERSION}" latest echo "::set-output name=digest::$(crane digest "${PACKAGE}:${VERSION}")" else - pack package-buildpack \ + pack buildpack package \ "${PACKAGE}:${VERSION}" \ --config "${HOME}"/package.toml \ --format "${FORMAT}" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6cb3ab6..4bae961 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,13 +10,9 @@ jobs: runs-on: - ubuntu-latest steps: - - if: ${{ github.event_name != 'pull_request' || ! github.event.pull_request.head.repo.fork }} - name: Docker login gcr.io - uses: docker/login-action@v1 + - uses: actions/setup-go@v2 with: - password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - registry: gcr.io - username: _json_key + go-version: "1.16" - name: Install create-package run: | #!/usr/bin/env bash @@ -43,8 +39,8 @@ jobs: | tar -C "${HOME}"/bin -xz pack env: PACK_VERSION: 0.18.1 - - if: ${{ false }} - name: Enable pack Experimental + - name: Enable pack Experimental + if: ${{ false }} run: | #!/usr/bin/env bash @@ -54,9 +50,6 @@ jobs: mkdir -p "${HOME}"/.pack echo "experimental = true" >> "${HOME}"/.pack/config.toml - - uses: actions/setup-go@v2 - with: - go-version: "1.16" - uses: actions/checkout@v2 - uses: actions/cache@v2 with: @@ -65,8 +58,8 @@ jobs: ${{ env.HOME }}/.pack ${{ env.HOME }}/carton-cache restore-keys: ${{ runner.os }}-go- - - id: version - name: Compute Version + - name: Compute Version + id: version run: | #!/usr/bin/env bash @@ -116,7 +109,7 @@ jobs: set -euo pipefail if [[ -n "${PUBLISH+x}" ]]; then - pack package-buildpack \ + pack buildpack package \ "${PACKAGE}:${VERSION}" \ --config "${HOME}"/package.toml \ --publish @@ -124,7 +117,7 @@ jobs: crane tag "${PACKAGE}:${VERSION}" latest echo "::set-output name=digest::$(crane digest "${PACKAGE}:${VERSION}")" else - pack package-buildpack \ + pack buildpack package \ "${PACKAGE}:${VERSION}" \ --config "${HOME}"/package.toml \ --format "${FORMAT}" diff --git a/.github/workflows/update-jdk-17.yml b/.github/workflows/update-jdk-17.yml new file mode 100644 index 0000000..fff28c9 --- /dev/null +++ b/.github/workflows/update-jdk-17.yml @@ -0,0 +1,95 @@ +name: Update JDK 17 +"on": + schedule: + - cron: 0 5 * * 1-5 + workflow_dispatch: {} +jobs: + update: + name: Update Buildpack Dependency + runs-on: + - ubuntu-latest + steps: + - uses: actions/setup-go@v2 + with: + go-version: "1.16" + - name: Install update-buildpack-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency + - 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" + + chmod +x "${HOME}"/bin/yj + env: + YJ_VERSION: 5.0.0 + - uses: actions/checkout@v2 + - id: dependency + uses: docker://ghcr.io/paketo-buildpacks/actions/foojay-dependency:main + with: + distro: oracle + type: jdk + version: "17" + - name: Update Buildpack Dependency + id: buildpack + run: | + #!/usr/bin/env bash + + set -euo pipefail + + OLD_VERSION=$(yj -tj < buildpack.toml | jq -r " + .metadata.dependencies[] | + select( .id == env.ID ) | + select( .version | test( env.VERSION_PATTERN ) ) | + .version") + + update-buildpack-dependency \ + --buildpack-toml buildpack.toml \ + --id "${ID}" \ + --version-pattern "${VERSION_PATTERN}" \ + --version "${VERSION}" \ + --uri "${URI}" \ + --sha256 "${SHA256}" + + git add buildpack.toml + git checkout -- . + + echo "::set-output name=old-version::${OLD_VERSION}" + echo "::set-output name=new-version::${VERSION}" + env: + ID: jdk + SHA256: ${{ steps.dependency.outputs.sha256 }} + URI: ${{ steps.dependency.outputs.uri }} + VERSION: ${{ steps.dependency.outputs.version }} + VERSION_PATTERN: 17\.[\d]+\.[\d]+ + - uses: peter-evans/create-pull-request@v3 + with: + author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> + body: Bumps `JDK 17` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. + branch: update/buildpack/jdk-17 + commit-message: |- + Bump JDK 17 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + + Bumps JDK 17 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}. + delete-branch: true + labels: semver:minor, type:dependency-upgrade + signoff: true + title: Bump JDK 17 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + token: ${{ secrets.JAVA_GITHUB_TOKEN }} diff --git a/.github/workflows/update-pipeline.yml b/.github/workflows/update-pipeline.yml index 6779037..0f5f54f 100644 --- a/.github/workflows/update-pipeline.yml +++ b/.github/workflows/update-pipeline.yml @@ -25,8 +25,8 @@ jobs: GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/pipeline-builder/cmd/octo - uses: actions/checkout@v2 - - id: pipeline - name: Update Pipeline + - name: Update Pipeline + id: pipeline run: | #!/usr/bin/env bash