Skip to content

Commit

Permalink
Merge branch 'main' into java-nmt
Browse files Browse the repository at this point in the history
  • Loading branch information
pivotal-david-osullivan authored Sep 22, 2021
2 parents bbb6ab8 + a841da9 commit 80bfe3e
Show file tree
Hide file tree
Showing 4 changed files with 231 additions and 1 deletion.
18 changes: 17 additions & 1 deletion .github/pipeline-descriptor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,20 @@ dependencies:
with:
product: liberica
type: jre
version: "16"
version: "16"
- name: JDK 17
id: jdk
version_pattern: "17\\.[\\d]+\\.[\\d]+"
uses: docker://ghcr.io/paketo-buildpacks/actions/bellsoft-liberica-dependency:main
with:
product: liberica
type: jdk
version: "17"
- name: JRE 17
id: jre
version_pattern: "17\\.[\\d]+\\.[\\d]+"
uses: docker://ghcr.io/paketo-buildpacks/actions/bellsoft-liberica-dependency:main
with:
product: liberica
type: jre
version: "17"
95 changes: 95 additions & 0 deletions .github/workflows/update-jdk-17.yml
Original file line number Diff line number Diff line change
@@ -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/bellsoft-liberica-dependency:main
with:
product: liberica
type: jdk
version: "17"
- id: buildpack
name: Update Buildpack Dependency
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 }}
95 changes: 95 additions & 0 deletions .github/workflows/update-jre-17.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
name: Update JRE 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/bellsoft-liberica-dependency:main
with:
product: liberica
type: jre
version: "17"
- id: buildpack
name: Update Buildpack Dependency
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: jre
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 `JRE 17` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`.
branch: update/buildpack/jre-17
commit-message: |-
Bump JRE 17 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
Bumps JRE 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 JRE 17 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}
token: ${{ secrets.JAVA_GITHUB_TOKEN }}
24 changes: 24 additions & 0 deletions buildpack.toml
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,30 @@ stacks = [ "io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*" ]
type = "GPL-2.0 WITH Classpath-exception-2.0"
uri = "https://openjdk.java.net/legal/gplv2+ce.html"

[[metadata.dependencies]]
id = "jdk"
name = "BellSoft Liberica JDK"
version = "17.0.0"
uri = "https://github.com/bell-sw/Liberica/releases/download/17+35/bellsoft-jdk17+35-linux-amd64.tar.gz"
sha256 = "90d7306195091c280da3c00bf1da62163aa99c9d5a2f40ea76925534be3538c0"
stacks = [ "io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*" ]

[[metadata.dependencies.licenses]]
type = "GPL-2.0 WITH Classpath-exception-2.0"
uri = "https://openjdk.java.net/legal/gplv2+ce.html"

[[metadata.dependencies]]
id = "jre"
name = "BellSoft Liberica JRE"
version = "17.0.0"
uri = "https://github.com/bell-sw/Liberica/releases/download/17+35/bellsoft-jre17+35-linux-amd64.tar.gz"
sha256 = "9e04fa20740e697752853da0f229c8ce7fbd5443db863bc93bb2c0fcc3fc4a62"
stacks = [ "io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*" ]

[[metadata.dependencies.licenses]]
type = "GPL-2.0 WITH Classpath-exception-2.0"
uri = "https://openjdk.java.net/legal/gplv2+ce.html"

[metadata]
pre-package = "scripts/build.sh"
include-files = [
Expand Down

0 comments on commit 80bfe3e

Please sign in to comment.