From f77a5b1a33cc98da77c2297d8cc45c05a6caafef Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Sat, 17 Jun 2023 10:59:07 -0400 Subject: [PATCH 1/4] Update update workflows 1. Remove Java 11. This has gone end of life upstream, so it is being removed. 2. Remove Java 19. This has gone end of life upstream, so it is being removed. 3. Add Java 20. This is the new short-term release. 4. Update Java 17 to use the new Github release update dependency. We can now use this to fetch dependencies from upstream instead of the custom updater. This works for Java 17 and Java 20. Signed-off-by: Daniel Mikusa --- .github/pipeline-descriptor.yml | 65 +++------- .github/workflows/pb-update-jdk-17.yml | 7 +- .github/workflows/pb-update-jdk-19.yml | 112 ------------------ ...update-jdk-11.yml => pb-update-jdk-20.yml} | 23 ++-- .../workflows/pb-update-native-image-11.yml | 112 ------------------ .../workflows/pb-update-native-image-17.yml | 112 ------------------ .../workflows/pb-update-native-image-19.yml | 112 ------------------ buildpack.toml | 76 ++---------- 8 files changed, 41 insertions(+), 578 deletions(-) delete mode 100644 .github/workflows/pb-update-jdk-19.yml rename .github/workflows/{pb-update-jdk-11.yml => pb-update-jdk-20.yml} (86%) delete mode 100644 .github/workflows/pb-update-native-image-11.yml delete mode 100644 .github/workflows/pb-update-native-image-17.yml delete mode 100644 .github/workflows/pb-update-native-image-19.yml diff --git a/.github/pipeline-descriptor.yml b/.github/pipeline-descriptor.yml index 50a3dcd..4dbfdea 100644 --- a/.github/pipeline-descriptor.yml +++ b/.github/pipeline-descriptor.yml @@ -20,60 +20,27 @@ docker_credentials: password: ${{ secrets.PAKETO_BUILDPACKS_DOCKERHUB_PASSWORD }} dependencies: -- name: JDK 11 - id: jdk - version_pattern: "11\\.[\\d]+\\.[\\d]+" - purl_pattern: "11\\.[\\d]+\\.[\\d]+" - uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main - with: - glob: graalvm-ce-java11-linux-amd64-.+.tar.gz - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - version: 11 -- name: Native Image 11 - id: native-image-svm - version_pattern: "11\\.[\\d]+\\.[\\d]+" - cpe_pattern: "[\\d]+\\.[\\d]+\\.[\\d]+\\.?[\\d]?" - purl_pattern: "[\\d]+\\.[\\d]+\\.[\\d]+\\.?[\\d]?" - uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main - with: - glob: native-image-installable-svm-java11-linux-amd64-.+.jar - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - version: 11 - name: JDK 17 id: jdk version_pattern: "17\\.[\\d]+\\.[\\d]+" purl_pattern: "17\\.[\\d]+\\.[\\d]+" - uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main + uses: docker://ghcr.io/paketo-buildpacks/actions/github-release-dependency:main with: - glob: graalvm-ce-java17-linux-amd64-.+.tar.gz - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - version: 17 -- name: Native Image 17 - id: native-image-svm - version_pattern: "17\\.[\\d]+\\.[\\d]+" - cpe_pattern: "[\\d]+\\.[\\d]+\\.[\\d]+\\.?[\\d]?" - purl_pattern: "[\\d]+\\.[\\d]+\\.[\\d]+\\.?[\\d]?" - uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main - with: - glob: native-image-installable-svm-java17-linux-amd64-.+.jar - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - version: 17 -- name: JDK 19 + glob: graalvm-community-jdk-.*_linux-x64_bin.tar.gz + owner: graalvm + repository: graalvm-ce-builds + tag_filter: "^jdk-(17\\.[\\d]+\\.[\\d])$" + token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} + version: 17 +- name: JDK 20 id: jdk - version_pattern: "19\\.[\\d]+\\.[\\d]+" - purl_pattern: "19\\.[\\d]+\\.[\\d]+" - uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main - with: - glob: graalvm-ce-java19-linux-amd64-.+.tar.gz - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - version: 19 -- name: Native Image 19 - id: native-image-svm - version_pattern: "19\\.[\\d]+\\.[\\d]+" - cpe_pattern: "[\\d]+\\.[\\d]+\\.[\\d]+\\.?[\\d]?" - purl_pattern: "[\\d]+\\.[\\d]+\\.[\\d]+\\.?[\\d]?" + version_pattern: "20\\.[\\d]+\\.[\\d]+" + purl_pattern: "20\\.[\\d]+\\.[\\d]+" uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main with: - glob: native-image-installable-svm-java19-linux-amd64-.+.jar - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - version: 19 + glob: graalvm-community-jdk-.*_linux-x64_bin.tar.gz + owner: graalvm + repository: graalvm-ce-builds + tag_filter: "^jdk-(20\\.[\\d]+\\.[\\d])$" + token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} + version: 20 \ No newline at end of file diff --git a/.github/workflows/pb-update-jdk-17.yml b/.github/workflows/pb-update-jdk-17.yml index 9d84efb..ad03a28 100644 --- a/.github/workflows/pb-update-jdk-17.yml +++ b/.github/workflows/pb-update-jdk-17.yml @@ -42,9 +42,12 @@ jobs: YJ_VERSION: 5.0.0 - uses: actions/checkout@v3 - id: dependency - uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main + uses: docker://ghcr.io/paketo-buildpacks/actions/github-release-dependency:main with: - glob: graalvm-ce-java17-linux-amd64-.+.tar.gz + glob: graalvm-community-jdk-.*_linux-x64_bin.tar.gz + owner: graalvm + repository: graalvm-ce-builds + tag_filter: ^jdk-(17\.[\d]+\.[\d])$ token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} version: 17 - name: Update Buildpack Dependency diff --git a/.github/workflows/pb-update-jdk-19.yml b/.github/workflows/pb-update-jdk-19.yml deleted file mode 100644 index 8296aa4..0000000 --- a/.github/workflows/pb-update-jdk-19.yml +++ /dev/null @@ -1,112 +0,0 @@ -name: Update JDK 19 -"on": - schedule: - - cron: 0 5 * * 1-5 - workflow_dispatch: {} -jobs: - update: - name: Update Buildpack Dependency - runs-on: - - ubuntu-latest - steps: - - uses: actions/setup-go@v4 - with: - go-version: "1.20" - - name: Install update-buildpack-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency@latest - - 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@v3 - - id: dependency - uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main - with: - glob: graalvm-ce-java19-linux-amd64-.+.tar.gz - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - version: 19 - - 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}" \ - --cpe-pattern "${CPE_PATTERN:-}" \ - --cpe "${CPE:-}" \ - --purl-pattern "${PURL_PATTERN:-}" \ - --purl "${PURL:-}" \ - --uri "${URI}" \ - --sha256 "${SHA256}" - - git add buildpack.toml - git checkout -- . - - if [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $1}')" != "$(echo "$VERSION" | awk -F '.' '{print $1}')" ]; then - LABEL="semver:major" - elif [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $2}')" != "$(echo "$VERSION" | awk -F '.' '{print $2}')" ]; then - LABEL="semver:minor" - else - LABEL="semver:patch" - fi - - echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT" - echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT" - echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT" - env: - CPE: ${{ steps.dependency.outputs.cpe }} - CPE_PATTERN: "" - ID: jdk - PURL: ${{ steps.dependency.outputs.purl }} - PURL_PATTERN: 19\.[\d]+\.[\d]+ - SHA256: ${{ steps.dependency.outputs.sha256 }} - URI: ${{ steps.dependency.outputs.uri }} - VERSION: ${{ steps.dependency.outputs.version }} - VERSION_PATTERN: 19\.[\d]+\.[\d]+ - - uses: peter-evans/create-pull-request@v5 - with: - author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> - body: Bumps `JDK 19` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. - branch: update/buildpack/jdk-19 - commit-message: |- - Bump JDK 19 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} - - Bumps JDK 19 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 JDK 19 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/pb-update-jdk-11.yml b/.github/workflows/pb-update-jdk-20.yml similarity index 86% rename from .github/workflows/pb-update-jdk-11.yml rename to .github/workflows/pb-update-jdk-20.yml index bd44304..9a28bf9 100644 --- a/.github/workflows/pb-update-jdk-11.yml +++ b/.github/workflows/pb-update-jdk-20.yml @@ -1,4 +1,4 @@ -name: Update JDK 11 +name: Update JDK 20 "on": schedule: - cron: 0 5 * * 1-5 @@ -44,9 +44,12 @@ jobs: - id: dependency uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main with: - glob: graalvm-ce-java11-linux-amd64-.+.tar.gz + glob: graalvm-community-jdk-.*_linux-x64_bin.tar.gz + owner: graalvm + repository: graalvm-ce-builds + tag_filter: ^jdk-(20\.[\d]+\.[\d])$ token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - version: 11 + version: 20 - name: Update Buildpack Dependency id: buildpack run: | @@ -91,22 +94,22 @@ jobs: CPE_PATTERN: "" ID: jdk PURL: ${{ steps.dependency.outputs.purl }} - PURL_PATTERN: 11\.[\d]+\.[\d]+ + PURL_PATTERN: 20\.[\d]+\.[\d]+ SHA256: ${{ steps.dependency.outputs.sha256 }} URI: ${{ steps.dependency.outputs.uri }} VERSION: ${{ steps.dependency.outputs.version }} - VERSION_PATTERN: 11\.[\d]+\.[\d]+ + VERSION_PATTERN: 20\.[\d]+\.[\d]+ - uses: peter-evans/create-pull-request@v5 with: author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> - body: Bumps `JDK 11` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. - branch: update/buildpack/jdk-11 + body: Bumps `JDK 20` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. + branch: update/buildpack/jdk-20 commit-message: |- - Bump JDK 11 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + Bump JDK 20 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} - Bumps JDK 11 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }}. + Bumps JDK 20 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 JDK 11 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + title: Bump JDK 20 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/pb-update-native-image-11.yml b/.github/workflows/pb-update-native-image-11.yml deleted file mode 100644 index 57f6633..0000000 --- a/.github/workflows/pb-update-native-image-11.yml +++ /dev/null @@ -1,112 +0,0 @@ -name: Update Native Image 11 -"on": - schedule: - - cron: 0 5 * * 1-5 - workflow_dispatch: {} -jobs: - update: - name: Update Buildpack Dependency - runs-on: - - ubuntu-latest - steps: - - uses: actions/setup-go@v4 - with: - go-version: "1.20" - - name: Install update-buildpack-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency@latest - - 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@v3 - - id: dependency - uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main - with: - glob: native-image-installable-svm-java11-linux-amd64-.+.jar - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - version: 11 - - 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}" \ - --cpe-pattern "${CPE_PATTERN:-}" \ - --cpe "${CPE:-}" \ - --purl-pattern "${PURL_PATTERN:-}" \ - --purl "${PURL:-}" \ - --uri "${URI}" \ - --sha256 "${SHA256}" - - git add buildpack.toml - git checkout -- . - - if [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $1}')" != "$(echo "$VERSION" | awk -F '.' '{print $1}')" ]; then - LABEL="semver:major" - elif [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $2}')" != "$(echo "$VERSION" | awk -F '.' '{print $2}')" ]; then - LABEL="semver:minor" - else - LABEL="semver:patch" - fi - - echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT" - echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT" - echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT" - env: - CPE: ${{ steps.dependency.outputs.cpe }} - CPE_PATTERN: '[\d]+\.[\d]+\.[\d]+\.?[\d]?' - ID: native-image-svm - PURL: ${{ steps.dependency.outputs.purl }} - PURL_PATTERN: '[\d]+\.[\d]+\.[\d]+\.?[\d]?' - SHA256: ${{ steps.dependency.outputs.sha256 }} - URI: ${{ steps.dependency.outputs.uri }} - VERSION: ${{ steps.dependency.outputs.version }} - VERSION_PATTERN: 11\.[\d]+\.[\d]+ - - uses: peter-evans/create-pull-request@v5 - with: - author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> - body: Bumps `Native Image 11` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. - branch: update/buildpack/native-image-11 - commit-message: |- - Bump Native Image 11 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} - - Bumps Native Image 11 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 Native Image 11 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/pb-update-native-image-17.yml b/.github/workflows/pb-update-native-image-17.yml deleted file mode 100644 index 02040e2..0000000 --- a/.github/workflows/pb-update-native-image-17.yml +++ /dev/null @@ -1,112 +0,0 @@ -name: Update Native Image 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@v4 - with: - go-version: "1.20" - - name: Install update-buildpack-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency@latest - - 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@v3 - - id: dependency - uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main - with: - glob: native-image-installable-svm-java17-linux-amd64-.+.jar - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - 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}" \ - --cpe-pattern "${CPE_PATTERN:-}" \ - --cpe "${CPE:-}" \ - --purl-pattern "${PURL_PATTERN:-}" \ - --purl "${PURL:-}" \ - --uri "${URI}" \ - --sha256 "${SHA256}" - - git add buildpack.toml - git checkout -- . - - if [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $1}')" != "$(echo "$VERSION" | awk -F '.' '{print $1}')" ]; then - LABEL="semver:major" - elif [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $2}')" != "$(echo "$VERSION" | awk -F '.' '{print $2}')" ]; then - LABEL="semver:minor" - else - LABEL="semver:patch" - fi - - echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT" - echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT" - echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT" - env: - CPE: ${{ steps.dependency.outputs.cpe }} - CPE_PATTERN: '[\d]+\.[\d]+\.[\d]+\.?[\d]?' - ID: native-image-svm - PURL: ${{ steps.dependency.outputs.purl }} - PURL_PATTERN: '[\d]+\.[\d]+\.[\d]+\.?[\d]?' - 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@v5 - with: - author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> - body: Bumps `Native Image 17` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. - branch: update/buildpack/native-image-17 - commit-message: |- - Bump Native Image 17 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} - - Bumps Native Image 17 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 Native Image 17 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/pb-update-native-image-19.yml b/.github/workflows/pb-update-native-image-19.yml deleted file mode 100644 index 5baf696..0000000 --- a/.github/workflows/pb-update-native-image-19.yml +++ /dev/null @@ -1,112 +0,0 @@ -name: Update Native Image 19 -"on": - schedule: - - cron: 0 5 * * 1-5 - workflow_dispatch: {} -jobs: - update: - name: Update Buildpack Dependency - runs-on: - - ubuntu-latest - steps: - - uses: actions/setup-go@v4 - with: - go-version: "1.20" - - name: Install update-buildpack-dependency - run: | - #!/usr/bin/env bash - - set -euo pipefail - - go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency@latest - - 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@v3 - - id: dependency - uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main - with: - glob: native-image-installable-svm-java19-linux-amd64-.+.jar - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} - version: 19 - - 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}" \ - --cpe-pattern "${CPE_PATTERN:-}" \ - --cpe "${CPE:-}" \ - --purl-pattern "${PURL_PATTERN:-}" \ - --purl "${PURL:-}" \ - --uri "${URI}" \ - --sha256 "${SHA256}" - - git add buildpack.toml - git checkout -- . - - if [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $1}')" != "$(echo "$VERSION" | awk -F '.' '{print $1}')" ]; then - LABEL="semver:major" - elif [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $2}')" != "$(echo "$VERSION" | awk -F '.' '{print $2}')" ]; then - LABEL="semver:minor" - else - LABEL="semver:patch" - fi - - echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT" - echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT" - echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT" - env: - CPE: ${{ steps.dependency.outputs.cpe }} - CPE_PATTERN: '[\d]+\.[\d]+\.[\d]+\.?[\d]?' - ID: native-image-svm - PURL: ${{ steps.dependency.outputs.purl }} - PURL_PATTERN: '[\d]+\.[\d]+\.[\d]+\.?[\d]?' - SHA256: ${{ steps.dependency.outputs.sha256 }} - URI: ${{ steps.dependency.outputs.uri }} - VERSION: ${{ steps.dependency.outputs.version }} - VERSION_PATTERN: 19\.[\d]+\.[\d]+ - - uses: peter-evans/create-pull-request@v5 - with: - author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> - body: Bumps `Native Image 19` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. - branch: update/buildpack/native-image-19 - commit-message: |- - Bump Native Image 19 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} - - Bumps Native Image 19 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 Native Image 19 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} - token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} diff --git a/buildpack.toml b/buildpack.toml index 14bbfba..8dc3752 100644 --- a/buildpack.toml +++ b/buildpack.toml @@ -1,4 +1,4 @@ -# Copyright 2018-2022 the original author or authors. +# Copyright 2018-2023 the original author or authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -133,35 +133,7 @@ api = "0.7" name = "JAVA_TOOL_OPTIONS" [[metadata.dependencies]] - cpes = ["cpe:2.3:a:oracle:jdk:11.0.20:*:*:*:*:*:*:*:*"] - id = "jdk" - name = "GraalVM JDK" - purl = "pkg:generic/graalvm-jdk@11.0.20" - sha256 = "959154e1248108dcd6eb279032cecdd2a6076bdebb345de9532681185231d255" - stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"] - uri = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.3/graalvm-ce-java11-linux-amd64-22.3.3.tar.gz" - version = "11.0.20" - - [[metadata.dependencies.licenses]] - type = "GPL-2.0 WITH Classpath-exception-2.0" - uri = "https://openjdk.java.net/legal/gplv2+ce.html" - - [[metadata.dependencies]] - cpes = ["cpe:2.3:a:oracle:graalvm:22.3.3:*:*:*:*:*:*:*"] - id = "native-image-svm" - name = "GraalVM Native Image Substrate VM" - purl = "pkg:generic/graalvm-svm@22.3.3" - sha256 = "5ea1681e5013a2dd7ff20543a3f1b3dea71dcea35e3b707b93f08453a954138f" - stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"] - uri = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.3/native-image-installable-svm-java11-linux-amd64-22.3.3.jar" - version = "11.0.20" - - [[metadata.dependencies.licenses]] - type = "GPL-2.0 WITH Classpath-exception-2.0" - uri = "https://openjdk.java.net/legal/gplv2+ce.html" - - [[metadata.dependencies]] - cpes = ["cpe:2.3:a:oracle:jdk:17.0.8:*:*:*:*:*:*:*:*"] + cpes = ["cpe:2.3:a:oracle:jdk:17.0.7:*:*:*:*:*:*:*:*"] id = "jdk" name = "GraalVM JDK" purl = "pkg:generic/graalvm-jdk@17.0.8" @@ -175,52 +147,18 @@ api = "0.7" uri = "https://openjdk.java.net/legal/gplv2+ce.html" [[metadata.dependencies]] - cpes = ["cpe:2.3:a:oracle:graalvm:22.3.3:*:*:*:*:*:*:*"] - id = "native-image-svm" - name = "GraalVM Native Image Substrate VM" - purl = "pkg:generic/graalvm-svm@22.3.3" - sha256 = "714788ad5bf71d5b8d003df64b2ed39adcc6d231a93d972086cd0b7a08921807" - stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"] - uri = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.3/native-image-installable-svm-java17-linux-amd64-22.3.3.jar" - version = "17.0.8" - - [[metadata.dependencies.licenses]] - type = "GPL-2.0 WITH Classpath-exception-2.0" - uri = "https://openjdk.java.net/legal/gplv2+ce.html" - - [[metadata.dependencies]] - cpes = ["cpe:2.3:a:oracle:jdk:19.0.2:*:*:*:*:*:*:*:*"] + cpes = ["cpe:2.3:a:oracle:jdk:20.0.1:*:*:*:*:*:*:*:*"] id = "jdk" name = "GraalVM JDK" - purl = "pkg:generic/graalvm-jdk@19.0.2" - sha256 = "7cd99d805e7a8b7d4c4576802fb107fb862944e47ce5f2e4f37c0f469a70dd2f" + purl = "pkg:generic/graalvm-jdk@20.0.1" + sha256 = "1c965f4698a5435bb8d094c9b2a13f7079e43d9934915964a2ee15fb81b53a79" stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"] - uri = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-java19-linux-amd64-22.3.1.tar.gz" - version = "19.0.2" + uri = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-20.0.1/graalvm-community-jdk-20.0.1_linux-x64_bin.tar.gz" + version = "20.0.1" [[metadata.dependencies.licenses]] type = "GPL-2.0 WITH Classpath-exception-2.0" uri = "https://openjdk.java.net/legal/gplv2+ce.html" - [[metadata.dependencies]] - cpes = ["cpe:2.3:a:oracle:graalvm:22.3.1:*:*:*:*:*:*:*"] - id = "native-image-svm" - name = "GraalVM Native Image Substrate VM" - purl = "pkg:generic/graalvm-svm@22.3.1" - sha256 = "61411f4edce57666c2ecd535aa71f970dec8ab4becf7f23b322845009e02ddab" - stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"] - uri = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/native-image-installable-svm-java19-linux-amd64-22.3.1.jar" - version = "19.0.2" - - [[metadata.dependencies.licenses]] - type = "GPL-2.0 WITH Classpath-exception-2.0" - uri = "https://openjdk.java.net/legal/gplv2+ce.html" - -[[stacks]] - id = "io.buildpacks.stacks.bionic" - -[[stacks]] - id = "io.paketo.stacks.tiny" - [[stacks]] id = "*" From 9329756c5d6dbc10dee4bb686a596171973cac22 Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Mon, 24 Jul 2023 21:58:40 -0400 Subject: [PATCH 2/4] Remove installation of tools via `gu` Signed-off-by: Daniel Mikusa --- cmd/main/main.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/main/main.go b/cmd/main/main.go index 16f1968..40a2e96 100644 --- a/cmd/main/main.go +++ b/cmd/main/main.go @@ -1,5 +1,5 @@ /* - * Copyright 2018-2020 the original author or authors. + * Copyright 2018-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,12 @@ package main import ( + "os" + "github.com/paketo-buildpacks/libjvm" "github.com/paketo-buildpacks/libjvm/helper" "github.com/paketo-buildpacks/libpak" "github.com/paketo-buildpacks/libpak/bard" - "os" ) func main() { @@ -35,9 +36,7 @@ func main() { libjvm.Detect{}, libjvm.NewBuild(logger, libjvm.WithNativeImage( libjvm.NativeImage{ - BundledWithJDK: false, - CustomCommand: "/bin/gu", - CustomArgs: []string{"install", "--local-file"}, + BundledWithJDK: true, })), ) } From d71a973fb1969f99c17f9b8a7ab765aa690c5b85 Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Wed, 26 Jul 2023 08:45:03 -0400 Subject: [PATCH 3/4] Add `native-image-svm` dependencies The way the libjvm support works, it needs a tag called `native-image-svm` for the bundled JDK+native image. This commit adds those, even though they are duplicates. Signed-off-by: Daniel Mikusa --- .github/pipeline-descriptor.yml | 24 ++++ .../workflows/pb-update-native-image-17.yml | 115 ++++++++++++++++++ .../workflows/pb-update-native-image-20.yml | 115 ++++++++++++++++++ buildpack.toml | 40 +++++- 4 files changed, 288 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/pb-update-native-image-17.yml create mode 100644 .github/workflows/pb-update-native-image-20.yml diff --git a/.github/pipeline-descriptor.yml b/.github/pipeline-descriptor.yml index 4dbfdea..c2b7865 100644 --- a/.github/pipeline-descriptor.yml +++ b/.github/pipeline-descriptor.yml @@ -37,6 +37,30 @@ dependencies: version_pattern: "20\\.[\\d]+\\.[\\d]+" purl_pattern: "20\\.[\\d]+\\.[\\d]+" uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main + with: + glob: graalvm-community-jdk-.*_linux-x64_bin.tar.gz + owner: graalvm + repository: graalvm-ce-builds + tag_filter: "^jdk-(20\\.[\\d]+\\.[\\d])$" + token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} + version: 20 +- name: Native Image 17 + id: native-image-svm + version_pattern: "17\\.[\\d]+\\.[\\d]+" + purl_pattern: "17\\.[\\d]+\\.[\\d]+" + uses: docker://ghcr.io/paketo-buildpacks/actions/github-release-dependency:main + with: + glob: graalvm-community-jdk-.*_linux-x64_bin.tar.gz + owner: graalvm + repository: graalvm-ce-builds + tag_filter: "^jdk-(17\\.[\\d]+\\.[\\d])$" + token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} + version: 17 +- name: Native Image 20 + id: native-image-svm + version_pattern: "20\\.[\\d]+\\.[\\d]+" + purl_pattern: "20\\.[\\d]+\\.[\\d]+" + uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main with: glob: graalvm-community-jdk-.*_linux-x64_bin.tar.gz owner: graalvm diff --git a/.github/workflows/pb-update-native-image-17.yml b/.github/workflows/pb-update-native-image-17.yml new file mode 100644 index 0000000..ecb9eb9 --- /dev/null +++ b/.github/workflows/pb-update-native-image-17.yml @@ -0,0 +1,115 @@ +name: Update Native Image 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@v4 + with: + go-version: "1.20" + - name: Install update-buildpack-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency@latest + - 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@v3 + - id: dependency + uses: docker://ghcr.io/paketo-buildpacks/actions/github-release-dependency:main + with: + glob: graalvm-community-jdk-.*_linux-x64_bin.tar.gz + owner: graalvm + repository: graalvm-ce-builds + tag_filter: ^jdk-(17\.[\d]+\.[\d])$ + token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} + 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}" \ + --cpe-pattern "${CPE_PATTERN:-}" \ + --cpe "${CPE:-}" \ + --purl-pattern "${PURL_PATTERN:-}" \ + --purl "${PURL:-}" \ + --uri "${URI}" \ + --sha256 "${SHA256}" + + git add buildpack.toml + git checkout -- . + + if [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $1}')" != "$(echo "$VERSION" | awk -F '.' '{print $1}')" ]; then + LABEL="semver:major" + elif [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $2}')" != "$(echo "$VERSION" | awk -F '.' '{print $2}')" ]; then + LABEL="semver:minor" + else + LABEL="semver:patch" + fi + + echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT" + echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT" + echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT" + env: + CPE: ${{ steps.dependency.outputs.cpe }} + CPE_PATTERN: "" + ID: native-image-svm + PURL: ${{ steps.dependency.outputs.purl }} + PURL_PATTERN: 17\.[\d]+\.[\d]+ + 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@v5 + with: + author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> + body: Bumps `Native Image 17` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. + branch: update/buildpack/native-image-17 + commit-message: |- + Bump Native Image 17 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + + Bumps Native Image 17 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 Native Image 17 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/pb-update-native-image-20.yml b/.github/workflows/pb-update-native-image-20.yml new file mode 100644 index 0000000..84fc891 --- /dev/null +++ b/.github/workflows/pb-update-native-image-20.yml @@ -0,0 +1,115 @@ +name: Update Native Image 20 +"on": + schedule: + - cron: 0 5 * * 1-5 + workflow_dispatch: {} +jobs: + update: + name: Update Buildpack Dependency + runs-on: + - ubuntu-latest + steps: + - uses: actions/setup-go@v4 + with: + go-version: "1.20" + - name: Install update-buildpack-dependency + run: | + #!/usr/bin/env bash + + set -euo pipefail + + go install -ldflags="-s -w" github.com/paketo-buildpacks/libpak/cmd/update-buildpack-dependency@latest + - 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@v3 + - id: dependency + uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main + with: + glob: graalvm-community-jdk-.*_linux-x64_bin.tar.gz + owner: graalvm + repository: graalvm-ce-builds + tag_filter: ^jdk-(20\.[\d]+\.[\d])$ + token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} + version: 20 + - 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}" \ + --cpe-pattern "${CPE_PATTERN:-}" \ + --cpe "${CPE:-}" \ + --purl-pattern "${PURL_PATTERN:-}" \ + --purl "${PURL:-}" \ + --uri "${URI}" \ + --sha256 "${SHA256}" + + git add buildpack.toml + git checkout -- . + + if [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $1}')" != "$(echo "$VERSION" | awk -F '.' '{print $1}')" ]; then + LABEL="semver:major" + elif [ "$(echo "$OLD_VERSION" | awk -F '.' '{print $2}')" != "$(echo "$VERSION" | awk -F '.' '{print $2}')" ]; then + LABEL="semver:minor" + else + LABEL="semver:patch" + fi + + echo "old-version=${OLD_VERSION}" >> "$GITHUB_OUTPUT" + echo "new-version=${VERSION}" >> "$GITHUB_OUTPUT" + echo "version-label=${LABEL}" >> "$GITHUB_OUTPUT" + env: + CPE: ${{ steps.dependency.outputs.cpe }} + CPE_PATTERN: "" + ID: native-image-svm + PURL: ${{ steps.dependency.outputs.purl }} + PURL_PATTERN: 20\.[\d]+\.[\d]+ + SHA256: ${{ steps.dependency.outputs.sha256 }} + URI: ${{ steps.dependency.outputs.uri }} + VERSION: ${{ steps.dependency.outputs.version }} + VERSION_PATTERN: 20\.[\d]+\.[\d]+ + - uses: peter-evans/create-pull-request@v5 + with: + author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com> + body: Bumps `Native Image 20` from `${{ steps.buildpack.outputs.old-version }}` to `${{ steps.buildpack.outputs.new-version }}`. + branch: update/buildpack/native-image-20 + commit-message: |- + Bump Native Image 20 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + + Bumps Native Image 20 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 Native Image 20 from ${{ steps.buildpack.outputs.old-version }} to ${{ steps.buildpack.outputs.new-version }} + token: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }} diff --git a/buildpack.toml b/buildpack.toml index 8dc3752..31472dc 100644 --- a/buildpack.toml +++ b/buildpack.toml @@ -135,12 +135,12 @@ api = "0.7" [[metadata.dependencies]] cpes = ["cpe:2.3:a:oracle:jdk:17.0.7:*:*:*:*:*:*:*:*"] id = "jdk" - name = "GraalVM JDK" - purl = "pkg:generic/graalvm-jdk@17.0.8" - sha256 = "ebc3200057ca865f0389abceb210f2d4c77d02cf09acf5ede1631d6b70924b00" + name = "GraalVM for JDK" + purl = "pkg:generic/graalvm-jdk@17.0.7" + sha256 = "094e5a7dcc4a903b70741d5c3c1688f83e83e2d44eb3d8d798c5d79ed902032c" stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"] - uri = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.3/graalvm-ce-java17-linux-amd64-22.3.3.tar.gz" - version = "17.0.8" + uri = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-17.0.7/graalvm-community-jdk-17.0.7_linux-x64_bin.tar.gz" + version = "17.0.7" [[metadata.dependencies.licenses]] type = "GPL-2.0 WITH Classpath-exception-2.0" @@ -149,7 +149,35 @@ api = "0.7" [[metadata.dependencies]] cpes = ["cpe:2.3:a:oracle:jdk:20.0.1:*:*:*:*:*:*:*:*"] id = "jdk" - name = "GraalVM JDK" + name = "GraalVM for JDK" + purl = "pkg:generic/graalvm-jdk@20.0.1" + sha256 = "1c965f4698a5435bb8d094c9b2a13f7079e43d9934915964a2ee15fb81b53a79" + stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"] + uri = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-20.0.1/graalvm-community-jdk-20.0.1_linux-x64_bin.tar.gz" + version = "20.0.1" + + [[metadata.dependencies.licenses]] + type = "GPL-2.0 WITH Classpath-exception-2.0" + uri = "https://openjdk.java.net/legal/gplv2+ce.html" + + [[metadata.dependencies]] + cpes = ["cpe:2.3:a:oracle:jdk:17.0.7:*:*:*:*:*:*:*:*"] + id = "native-image-svm" + name = "GraalVM for Native Image" + purl = "pkg:generic/graalvm-jdk@17.0.7" + sha256 = "094e5a7dcc4a903b70741d5c3c1688f83e83e2d44eb3d8d798c5d79ed902032c" + stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"] + uri = "https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-17.0.7/graalvm-community-jdk-17.0.7_linux-x64_bin.tar.gz" + version = "17.0.7" + + [[metadata.dependencies.licenses]] + type = "GPL-2.0 WITH Classpath-exception-2.0" + uri = "https://openjdk.java.net/legal/gplv2+ce.html" + + [[metadata.dependencies]] + cpes = ["cpe:2.3:a:oracle:jdk:20.0.1:*:*:*:*:*:*:*:*"] + id = "native-image-svm" + name = "GraalVM for Native Image" purl = "pkg:generic/graalvm-jdk@20.0.1" sha256 = "1c965f4698a5435bb8d094c9b2a13f7079e43d9934915964a2ee15fb81b53a79" stacks = ["io.buildpacks.stacks.bionic", "io.paketo.stacks.tiny", "*"] From 45fb686df40636582397679348f6ac95664b0731 Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Wed, 26 Jul 2023 08:46:50 -0400 Subject: [PATCH 4/4] Fix typo, use github-release-dependency for update checks Signed-off-by: Daniel Mikusa --- .github/pipeline-descriptor.yml | 4 ++-- .github/workflows/pb-update-jdk-20.yml | 2 +- .github/workflows/pb-update-native-image-20.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/pipeline-descriptor.yml b/.github/pipeline-descriptor.yml index c2b7865..8d69c9c 100644 --- a/.github/pipeline-descriptor.yml +++ b/.github/pipeline-descriptor.yml @@ -36,7 +36,7 @@ dependencies: id: jdk version_pattern: "20\\.[\\d]+\\.[\\d]+" purl_pattern: "20\\.[\\d]+\\.[\\d]+" - uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main + uses: docker://ghcr.io/paketo-buildpacks/actions/github-release-dependency:main with: glob: graalvm-community-jdk-.*_linux-x64_bin.tar.gz owner: graalvm @@ -60,7 +60,7 @@ dependencies: id: native-image-svm version_pattern: "20\\.[\\d]+\\.[\\d]+" purl_pattern: "20\\.[\\d]+\\.[\\d]+" - uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main + uses: docker://ghcr.io/paketo-buildpacks/actions/github-release-dependency:main with: glob: graalvm-community-jdk-.*_linux-x64_bin.tar.gz owner: graalvm diff --git a/.github/workflows/pb-update-jdk-20.yml b/.github/workflows/pb-update-jdk-20.yml index 9a28bf9..df18c88 100644 --- a/.github/workflows/pb-update-jdk-20.yml +++ b/.github/workflows/pb-update-jdk-20.yml @@ -42,7 +42,7 @@ jobs: YJ_VERSION: 5.0.0 - uses: actions/checkout@v3 - id: dependency - uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main + uses: docker://ghcr.io/paketo-buildpacks/actions/github-release-dependency:main with: glob: graalvm-community-jdk-.*_linux-x64_bin.tar.gz owner: graalvm diff --git a/.github/workflows/pb-update-native-image-20.yml b/.github/workflows/pb-update-native-image-20.yml index 84fc891..54d048c 100644 --- a/.github/workflows/pb-update-native-image-20.yml +++ b/.github/workflows/pb-update-native-image-20.yml @@ -42,7 +42,7 @@ jobs: YJ_VERSION: 5.0.0 - uses: actions/checkout@v3 - id: dependency - uses: docker://ghcr.io/paketo-buildpacks/actions/graalvm-dependency:main + uses: docker://ghcr.io/paketo-buildpacks/actions/github-release-dependency:main with: glob: graalvm-community-jdk-.*_linux-x64_bin.tar.gz owner: graalvm