From 29057b5c8e6b02850216914b8fee78c84bde585a Mon Sep 17 00:00:00 2001 From: paketo-bot Date: Wed, 31 Jul 2024 01:29:05 +0000 Subject: [PATCH 1/3] Update builder.toml --- builder.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builder.toml b/builder.toml index fce98d4..ba35891 100644 --- a/builder.toml +++ b/builder.toml @@ -13,15 +13,15 @@ description = "Tiny base image (Ubuntu Jammy Jellyfish build image, distroless-l [[order]] -[[order.group]] - id = "paketo-buildpacks/java-native-image" - version = "9.8.0" + [[order.group]] + id = "paketo-buildpacks/java-native-image" + version = "9.8.0" [[order]] -[[order.group]] - id = "paketo-buildpacks/java" - version = "15.2.0" + [[order.group]] + id = "paketo-buildpacks/java" + version = "15.2.0" [stack] build-image = "docker.io/paketobuildpacks/build-jammy-tiny:0.2.43" From 4f60b4a5fd08fadfc6b49009d3ca75706c1083ac Mon Sep 17 00:00:00 2001 From: Anthony Dahanne Date: Tue, 30 Jul 2024 22:51:49 -0400 Subject: [PATCH 2/3] No need for a pull policy * we use a local registry on port 5000 --- smoke/java_native_image_test.go | 1 - smoke/java_test.go | 1 - 2 files changed, 2 deletions(-) diff --git a/smoke/java_native_image_test.go b/smoke/java_native_image_test.go index bae80c3..38f93de 100644 --- a/smoke/java_native_image_test.go +++ b/smoke/java_native_image_test.go @@ -56,7 +56,6 @@ func testJavaNativeImage(t *testing.T, context spec.G, it spec.S) { var logs fmt.Stringer image, logs, err = pack.Build. - WithPullPolicy("never"). WithBuilder(Builder). WithEnv(map[string]string{"BP_NATIVE_IMAGE": "true", "BP_JVM_VERSION": "17", "BP_MAVEN_BUILD_ARGUMENTS": "-Pnative --batch-mode -Dmaven.test.skip=true --no-transfer-progress package", "USE_NATIVE_IMAGE_JAVA_PLATFORM_MODULE_SYSTEM": "false"}). Execute(name, source) diff --git a/smoke/java_test.go b/smoke/java_test.go index a2ea307..34feee3 100644 --- a/smoke/java_test.go +++ b/smoke/java_test.go @@ -57,7 +57,6 @@ func testJava(t *testing.T, context spec.G, it spec.S) { var logs fmt.Stringer image, logs, err = pack.Build. - WithPullPolicy("never"). WithBuilder(Builder). WithEnv(map[string]string{"BP_JVM_VERSION": "17"}). Execute(name, source) From 73c0adefd8115f515e3db7c3748729473834624f Mon Sep 17 00:00:00 2001 From: Anthony Dahanne Date: Tue, 30 Jul 2024 23:06:07 -0400 Subject: [PATCH 3/3] Disable buildjet for now * paketo-community does not have access to it --- .github/workflows/create-release.yml | 3 ++- .github/workflows/test-builder.yml | 3 ++- .github/workflows/test-pull-request.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index d7638ed..7f85dc3 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -14,7 +14,8 @@ jobs: runs-on: ${{ matrix.runner }} strategy: matrix: - runner: [ ubuntu-22.04, buildjet-4vcpu-ubuntu-2204-arm ] + runner: [ ubuntu-22.04 ] + # paketo-community does not have access to buildjet , buildjet-4vcpu-ubuntu-2204-arm ] outputs: release_notes: ${{ steps.notes.outputs.body }} steps: diff --git a/.github/workflows/test-builder.yml b/.github/workflows/test-builder.yml index 65c9519..1dadb21 100644 --- a/.github/workflows/test-builder.yml +++ b/.github/workflows/test-builder.yml @@ -10,7 +10,8 @@ jobs: runs-on: ${{ matrix.runner }} strategy: matrix: - runner: [ ubuntu-22.04, buildjet-4vcpu-ubuntu-2204-arm ] + runner: [ ubuntu-22.04 ] + # paketo-community does not have access to buildjet , buildjet-4vcpu-ubuntu-2204-arm ] steps: - name: Setup Go uses: actions/setup-go@v3 diff --git a/.github/workflows/test-pull-request.yml b/.github/workflows/test-pull-request.yml index c1323b0..c3f3342 100644 --- a/.github/workflows/test-pull-request.yml +++ b/.github/workflows/test-pull-request.yml @@ -11,7 +11,8 @@ jobs: runs-on: ${{ matrix.runner }} strategy: matrix: - runner: [ ubuntu-22.04, buildjet-4vcpu-ubuntu-2204-arm ] + runner: [ ubuntu-22.04 ] + # paketo-community does not have access to buildjet , buildjet-4vcpu-ubuntu-2204-arm ] steps: - name: Setup Go