Skip to content
This repository has been archived by the owner on Oct 3, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1 from paketo-community/automation/builder-toml
Browse files Browse the repository at this point in the history
Updating builder.toml
  • Loading branch information
anthonydahanne authored Jul 31, 2024
2 parents fbf3859 + 73c0ade commit 216f189
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions builder.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion smoke/java_native_image_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion smoke/java_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 216f189

Please sign in to comment.