diff --git a/CODEOWNERS b/.github/CODEOWNERS similarity index 100% rename from CODEOWNERS rename to .github/CODEOWNERS diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1d283337..9a01650c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,10 +7,3 @@ updates: labels: - semver:patch - type:dependency-upgrade - - package-ecosystem: gomod - directory: / - schedule: - interval: daily - labels: - - semver:patch - - type:dependency-upgrade diff --git a/.github/workflows/create-package.yml b/.github/workflows/create-package.yml index e9fa2128..28a10115 100644 --- a/.github/workflows/create-package.yml +++ b/.github/workflows/create-package.yml @@ -9,87 +9,98 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - - id: version - name: Compute Version + - if: ${{ false }} + uses: actions/cache@v2 + with: + key: ${{ runner.os }}-go-${{ hashFiles('**/buildpack.toml', '**/package.toml') }} + path: |- + ${{ env.HOME }}/.pack + ${{ env.HOME }}/carton-cache + restore-keys: ${{ runner.os }}-go- + - uses: actions/setup-go@v2 + with: + go-version: "1.15" + - name: Install crane run: | #!/usr/bin/env bash set -euo pipefail - PATTERN="refs/tags/v([0-9]+\.[0-9]+\.[0-9]+)" - if [[ ${GITHUB_REF} =~ ${PATTERN} ]]; then - VERSION=${BASH_REMATCH[1]} - else - VERSION=$(git rev-parse --short HEAD) - fi - - echo "::set-output name=version::${VERSION}" - printf "Selected %s from - * ref: %s - * sha: %s - " "${VERSION}" "${GITHUB_REF}" "${GITHUB_SHA}" - - uses: actions/setup-go@v2 - with: - go-version: "1.15" - - name: Install Create Package + GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install create-package run: | #!/usr/bin/env bash set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/create-package - - name: Create Package + - name: Install pack run: | #!/usr/bin/env bash set -euo pipefail - if [[ -n "${INCLUDE_DEPENDENCIES+x}" ]]; then - create-package \ - --cache-location "${HOME}"/carton-cache \ - --destination "${HOME}"/buildpack \ - --include-dependencies \ - --version "${VERSION}" - else - create-package \ - --destination "${HOME}"/buildpack \ - --version "${VERSION}" - fi + mkdir -p "${HOME}"/bin + echo "${HOME}/bin" >> "${GITHUB_PATH}" - [[ -e package.toml ]] && cp package.toml "${HOME}"/package.toml - printf '[buildpack]\nuri = "%s"' "${HOME}"/buildpack >> "${HOME}"/package.toml + 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/ -xzv pack env: - VERSION: ${{ steps.version.outputs.version }} - - name: Install Crane + PACK_VERSION: 0.14.1 + - id: version + name: Compute Version run: | #!/usr/bin/env bash set -euo pipefail - GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane - - name: Install pack + if [[ ${GITHUB_REF} =~ refs/tags/v([0-9]+\.[0-9]+\.[0-9]+) ]]; then + VERSION=${BASH_REMATCH[1]} + elif [[ ${GITHUB_REF} =~ refs/heads/(.+) ]]; then + VERSION=${BASH_REMATCH[1]} + else + VERSION=$(git rev-parse --short HEAD) + fi + + echo "::set-output name=version::${VERSION}" + echo "Selected ${VERSION} from + * ref: ${GITHUB_REF} + * sha: ${GITHUB_SHA} + " + - name: Create Package run: | #!/usr/bin/env bash set -euo pipefail - mkdir -p "${HOME}"/bin - echo "::add-path::${HOME}/bin" + if [[ -n "${INCLUDE_DEPENDENCIES+x}" ]]; then + create-package \ + --cache-location "${HOME}"/carton-cache \ + --destination "${HOME}"/buildpack \ + --include-dependencies \ + --version "${VERSION}" + else + create-package \ + --destination "${HOME}"/buildpack \ + --version "${VERSION}" + fi - 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/ -xzv pack + [[ -e package.toml ]] && cp package.toml "${HOME}"/package.toml + printf '[buildpack]\nuri = "%s"' "${HOME}"/buildpack >> "${HOME}"/package.toml env: - PACK_VERSION: 0.13.1 - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker + INCLUDE_DEPENDENCIES: "false" + VERSION: ${{ steps.version.outputs.version }} - id: package name: Package Buildpack run: | diff --git a/.github/workflows/minimal-labels.yml b/.github/workflows/minimal-labels.yml index eb913206..1bb1fd65 100644 --- a/.github/workflows/minimal-labels.yml +++ b/.github/workflows/minimal-labels.yml @@ -2,7 +2,6 @@ name: Minimal Labels "on": pull_request: types: - - opened - synchronize - reopened - labeled diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8ed00de8..a1f674d8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,12 +5,52 @@ name: Tests branches: - main jobs: - package: - name: Package Test + create-package: + name: Create Package Test runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 + - uses: actions/cache@v2 + with: + key: ${{ runner.os }}-go-${{ hashFiles('**/buildpack.toml', '**/package.toml') }} + path: |- + ${{ env.HOME }}/.pack + ${{ env.HOME }}/carton-cache + restore-keys: ${{ runner.os }}-go- + - uses: actions/setup-go@v2 + with: + go-version: "1.15" + - name: Install create-package + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/create-package + - name: Install pack + run: | + #!/usr/bin/env bash + + set -euo pipefail + + 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/ -xzv pack + env: + PACK_VERSION: 0.14.1 - id: version name: Compute Version run: | @@ -18,33 +58,19 @@ jobs: set -euo pipefail - PATTERN="refs/tags/v([0-9]+\.[0-9]+\.[0-9]+)" - if [[ ${GITHUB_REF} =~ ${PATTERN} ]]; then + if [[ ${GITHUB_REF} =~ refs/tags/v([0-9]+\.[0-9]+\.[0-9]+) ]]; then + VERSION=${BASH_REMATCH[1]} + elif [[ ${GITHUB_REF} =~ refs/heads/(.+) ]]; then VERSION=${BASH_REMATCH[1]} else VERSION=$(git rev-parse --short HEAD) fi echo "::set-output name=version::${VERSION}" - printf "Selected %s from - * ref: %s - * sha: %s - " "${VERSION}" "${GITHUB_REF}" "${GITHUB_SHA}" - - uses: actions/setup-go@v2 - with: - go-version: "1.15" - - uses: actions/cache@v2 - with: - key: ${{ runner.os }}-go-${{ hashFiles('**/buildpack.toml') }} - path: ${{ env.HOME }}/carton-cache - restore-keys: ${{ runner.os }}-go- - - name: Install Create Package - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/create-package + echo "Selected ${VERSION} from + * ref: ${GITHUB_REF} + * sha: ${GITHUB_SHA} + " - name: Create Package run: | #!/usr/bin/env bash @@ -53,14 +79,14 @@ jobs: if [[ -n "${INCLUDE_DEPENDENCIES+x}" ]]; then create-package \ - --cache-location "${HOME}"/carton-cache \ - --destination "${HOME}"/buildpack \ - --include-dependencies \ - --version "${VERSION}" + --cache-location "${HOME}"/carton-cache \ + --destination "${HOME}"/buildpack \ + --include-dependencies \ + --version "${VERSION}" else create-package \ - --destination "${HOME}"/buildpack \ - --version "${VERSION}" + --destination "${HOME}"/buildpack \ + --version "${VERSION}" fi [[ -e package.toml ]] && cp package.toml "${HOME}"/package.toml @@ -68,23 +94,6 @@ jobs: env: INCLUDE_DEPENDENCIES: "true" VERSION: ${{ steps.version.outputs.version }} - - name: Install pack - run: | - #!/usr/bin/env bash - - set -euo pipefail - - mkdir -p "${HOME}"/bin - echo "::add-path::${HOME}/bin" - - 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/ -xzv pack - env: - PACK_VERSION: 0.13.1 - name: Package Buildpack run: | #!/usr/bin/env bash diff --git a/.github/workflows/update-apache-tomcat.yml b/.github/workflows/update-apache-tomcat.yml index d59ea71a..1918a699 100644 --- a/.github/workflows/update-apache-tomcat.yml +++ b/.github/workflows/update-apache-tomcat.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/apache-tomcat`](https://gcr.io/paketo-buildpacks/apache-tomcat) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/apache-tomcat:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/apache-tomcat:${{ steps.package.outputs.new-version }}). - branch: update-package/apache-tomcat + branch: update/package/apache-tomcat commit-message: |- Bump gcr.io/paketo-buildpacks/apache-tomcat from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/update-azul-zulu.yml b/.github/workflows/update-azul-zulu.yml index e2b35311..9dbb48e5 100644 --- a/.github/workflows/update-azul-zulu.yml +++ b/.github/workflows/update-azul-zulu.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/azul-zulu`](https://gcr.io/paketo-buildpacks/azul-zulu) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/azul-zulu:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/azul-zulu:${{ steps.package.outputs.new-version }}). - branch: update-package/azul-zulu + branch: update/package/azul-zulu commit-message: |- Bump gcr.io/paketo-buildpacks/azul-zulu from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/update-azure-application-insights.yml b/.github/workflows/update-azure-application-insights.yml index 16b1f912..c2c8277b 100644 --- a/.github/workflows/update-azure-application-insights.yml +++ b/.github/workflows/update-azure-application-insights.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/azure-application-insights`](https://gcr.io/paketo-buildpacks/azure-application-insights) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/azure-application-insights:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/azure-application-insights:${{ steps.package.outputs.new-version }}). - branch: update-package/azure-application-insights + branch: update/package/azure-application-insights commit-message: |- Bump gcr.io/paketo-buildpacks/azure-application-insights from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/update-debug.yml b/.github/workflows/update-debug.yml index b8d1b27e..2165d9c6 100644 --- a/.github/workflows/update-debug.yml +++ b/.github/workflows/update-debug.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/debug`](https://gcr.io/paketo-buildpacks/debug) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/debug:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/debug:${{ steps.package.outputs.new-version }}). - branch: update-package/debug + branch: update/package/debug commit-message: |- Bump gcr.io/paketo-buildpacks/debug from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/update-dist-zip.yml b/.github/workflows/update-dist-zip.yml index 7ad96dd8..902bcf75 100644 --- a/.github/workflows/update-dist-zip.yml +++ b/.github/workflows/update-dist-zip.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/dist-zip`](https://gcr.io/paketo-buildpacks/dist-zip) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/dist-zip:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/dist-zip:${{ steps.package.outputs.new-version }}). - branch: update-package/dist-zip + branch: update/package/dist-zip commit-message: |- Bump gcr.io/paketo-buildpacks/dist-zip from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/update-draft-release.yml b/.github/workflows/update-draft-release.yml index 9b0aabfe..26ef4406 100644 --- a/.github/workflows/update-draft-release.yml +++ b/.github/workflows/update-draft-release.yml @@ -3,7 +3,6 @@ name: Update Draft Release push: branches: - main - workflow_dispatch: {} jobs: update: name: Update Draft Release @@ -14,7 +13,12 @@ jobs: uses: release-drafter/release-drafter@v5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/checkout@v2 + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/setup-go@v2 with: go-version: "1.15" @@ -25,11 +29,7 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker + - uses: actions/checkout@v2 - name: Install yj run: | #!/usr/bin/env bash @@ -37,14 +37,14 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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: @@ -57,14 +57,16 @@ jobs: PAYLOAD=$(yj -tj < buildpack.toml | jq '{ primary: . }') - for PACKAGE in $(yj -t < package.toml | jq -r '.dependencies[].image'); do - PAYLOAD=$(jq -n -r \ - --argjson PAYLOAD "${PAYLOAD}" \ - --argjson BUILDPACK "$(crane export "${PACKAGE}" - \ - | tar xOf - --absolute-names --wildcards "/cnb/buildpacks/*/*/buildpack.toml" \ - | yj -tj)" \ - '$PAYLOAD | .buildpacks += [ $BUILDPACK ]') - done + if [[ -e package.toml ]]; then + for PACKAGE in $(yj -t < package.toml | jq -r '.dependencies[].image'); do + PAYLOAD=$(jq -n -r \ + --argjson PAYLOAD "${PAYLOAD}" \ + --argjson BUILDPACK "$(crane export "${PACKAGE}" - \ + | tar xOf - --absolute-names --wildcards "/cnb/buildpacks/*/*/buildpack.toml" \ + | yj -tj)" \ + '$PAYLOAD | .buildpacks += [ $BUILDPACK ]') + done + fi jq -n -r \ --argjson PAYLOAD "${PAYLOAD}" \ diff --git a/.github/workflows/update-encrypt-at-rest.yml b/.github/workflows/update-encrypt-at-rest.yml index 41b0f3e6..0badaac4 100644 --- a/.github/workflows/update-encrypt-at-rest.yml +++ b/.github/workflows/update-encrypt-at-rest.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/encrypt-at-rest`](https://gcr.io/paketo-buildpacks/encrypt-at-rest) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/encrypt-at-rest:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/encrypt-at-rest:${{ steps.package.outputs.new-version }}). - branch: update-package/encrypt-at-rest + branch: update/package/encrypt-at-rest commit-message: |- Bump gcr.io/paketo-buildpacks/encrypt-at-rest from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/update-environment-variables.yml b/.github/workflows/update-environment-variables.yml index 7b25779f..1258c5be 100644 --- a/.github/workflows/update-environment-variables.yml +++ b/.github/workflows/update-environment-variables.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/environment-variables`](https://gcr.io/paketo-buildpacks/environment-variables) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/environment-variables:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/environment-variables:${{ steps.package.outputs.new-version }}). - branch: update-package/environment-variables + branch: update/package/environment-variables commit-message: |- Bump gcr.io/paketo-buildpacks/environment-variables from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/update-executable-jar.yml b/.github/workflows/update-executable-jar.yml index 8a8c76d4..8985278b 100644 --- a/.github/workflows/update-executable-jar.yml +++ b/.github/workflows/update-executable-jar.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/executable-jar`](https://gcr.io/paketo-buildpacks/executable-jar) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/executable-jar:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/executable-jar:${{ steps.package.outputs.new-version }}). - branch: update-package/executable-jar + branch: update/package/executable-jar commit-message: |- Bump gcr.io/paketo-buildpacks/executable-jar from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/update-gradle.yml b/.github/workflows/update-gradle.yml index 7b11edca..7f4acbb4 100644 --- a/.github/workflows/update-gradle.yml +++ b/.github/workflows/update-gradle.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/gradle`](https://gcr.io/paketo-buildpacks/gradle) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/gradle:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/gradle:${{ steps.package.outputs.new-version }}). - branch: update-package/gradle + branch: update/package/gradle commit-message: |- Bump gcr.io/paketo-buildpacks/gradle from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/update-image-labels.yml b/.github/workflows/update-image-labels.yml index 6f35e6e9..9b661ff7 100644 --- a/.github/workflows/update-image-labels.yml +++ b/.github/workflows/update-image-labels.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/image-labels`](https://gcr.io/paketo-buildpacks/image-labels) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/image-labels:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/image-labels:${{ steps.package.outputs.new-version }}). - branch: update-package/image-labels + branch: update/package/image-labels commit-message: |- Bump gcr.io/paketo-buildpacks/image-labels from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/update-jmx.yml b/.github/workflows/update-jmx.yml index ed270539..ab411c82 100644 --- a/.github/workflows/update-jmx.yml +++ b/.github/workflows/update-jmx.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/jmx`](https://gcr.io/paketo-buildpacks/jmx) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/jmx:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/jmx:${{ steps.package.outputs.new-version }}). - branch: update-package/jmx + branch: update/package/jmx commit-message: |- Bump gcr.io/paketo-buildpacks/jmx from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/update-leiningen.yml b/.github/workflows/update-leiningen.yml index ad902578..d06ccc65 100644 --- a/.github/workflows/update-leiningen.yml +++ b/.github/workflows/update-leiningen.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/leiningen`](https://gcr.io/paketo-buildpacks/leiningen) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/leiningen:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/leiningen:${{ steps.package.outputs.new-version }}). - branch: update-package/leiningen + branch: update/package/leiningen commit-message: |- Bump gcr.io/paketo-buildpacks/leiningen from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/update-maven.yml b/.github/workflows/update-maven.yml index 07df4a26..d9a01be4 100644 --- a/.github/workflows/update-maven.yml +++ b/.github/workflows/update-maven.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/maven`](https://gcr.io/paketo-buildpacks/maven) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/maven:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/maven:${{ steps.package.outputs.new-version }}). - branch: update-package/maven + branch: update/package/maven commit-message: |- Bump gcr.io/paketo-buildpacks/maven from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/update-procfile.yml b/.github/workflows/update-procfile.yml index 9a751231..c066a841 100644 --- a/.github/workflows/update-procfile.yml +++ b/.github/workflows/update-procfile.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/procfile`](https://gcr.io/paketo-buildpacks/procfile) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/procfile:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/procfile:${{ steps.package.outputs.new-version }}). - branch: update-package/procfile + branch: update/package/procfile commit-message: |- Bump gcr.io/paketo-buildpacks/procfile from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/update-sbt.yml b/.github/workflows/update-sbt.yml index e804d7a3..93e49eba 100644 --- a/.github/workflows/update-sbt.yml +++ b/.github/workflows/update-sbt.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/sbt`](https://gcr.io/paketo-buildpacks/sbt) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/sbt:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/sbt:${{ steps.package.outputs.new-version }}). - branch: update-package/sbt + branch: update/package/sbt commit-message: |- Bump gcr.io/paketo-buildpacks/sbt from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }} diff --git a/.github/workflows/update-spring-boot.yml b/.github/workflows/update-spring-boot.yml index 5faa1629..11714d42 100644 --- a/.github/workflows/update-spring-boot.yml +++ b/.github/workflows/update-spring-boot.yml @@ -9,6 +9,12 @@ jobs: runs-on: - ubuntu-latest steps: + - name: Docker login gcr.io + uses: docker/login-action@v1 + with: + password: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} + registry: gcr.io + username: _json_key - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: @@ -20,6 +26,13 @@ jobs: set -euo pipefail GO111MODULE=on go get -u -ldflags="-s -w" github.com/google/go-containerregistry/cmd/crane + - name: Install update-package-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - name: Install yj run: | #!/usr/bin/env bash @@ -27,30 +40,18 @@ jobs: set -euo pipefail mkdir -p "${HOME}"/bin - echo "::add-path::${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" + --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 - - name: Install update-package-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - GO111MODULE=on go get -u -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-package-dependency - - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.JAVA_GCLOUD_SERVICE_ACCOUNT_KEY }} - - name: Configure gcloud docker credentials - run: gcloud auth configure-docker - id: package name: Update Package Dependency run: | @@ -58,15 +59,30 @@ jobs: set -euo pipefail - OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | select(. | startswith(\"${DEPENDENCY}\"))") - OLD_VERSION=${OLD_VERSION#*:} - NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n1) + NEW_VERSION=$(crane ls "${DEPENDENCY}" | grep -v latest | sort -V | tail -n 1) + + if [[ -e builder.toml ]]; then + OLD_VERSION=$(yj -tj < builder.toml | jq -r ".buildpacks[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --builder-toml builder.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add builder.toml + elif [[ -e package.toml ]]; then + OLD_VERSION=$(yj -tj < package.toml | jq -r ".dependencies[].image | capture(\"${DEPENDENCY}:(?.+)\") | .version") + + update-package-dependency \ + --buildpack-toml buildpack.toml \ + --package-toml package.toml \ + --id "${DEPENDENCY}" \ + --version "${NEW_VERSION}" + + git add buildpack.toml package.toml + fi - update-package-dependency \ - --buildpack-toml buildpack.toml \ - --package-toml package.toml \ - --id "${DEPENDENCY}" \ - --version "${NEW_VERSION}" + git checkout -- . echo "::set-output name=old-version::${OLD_VERSION}" echo "::set-output name=new-version::${NEW_VERSION}" @@ -75,7 +91,7 @@ jobs: - uses: peter-evans/create-pull-request@v3 with: body: Bumps [`gcr.io/paketo-buildpacks/spring-boot`](https://gcr.io/paketo-buildpacks/spring-boot) from [`${{ steps.package.outputs.old-version }}`](https://gcr.io/paketo-buildpacks/spring-boot:${{ steps.package.outputs.old-version }}) to [`${{ steps.package.outputs.new-version }}`](https://gcr.io/paketo-buildpacks/spring-boot:${{ steps.package.outputs.new-version }}). - branch: update-package/spring-boot + branch: update/package/spring-boot commit-message: |- Bump gcr.io/paketo-buildpacks/spring-boot from ${{ steps.package.outputs.old-version }} to ${{ steps.package.outputs.new-version }}