Skip to content

Commit c4921a8

Browse files
committed
Update to latest version Java 26
1 parent ef109ab commit c4921a8

2 files changed

Lines changed: 1 addition & 5 deletions

File tree

build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ readonly VARIANTS=(
1919
graalvm25
2020
)
2121

22-
readonly LATEST_VERSION="24"
22+
readonly LATEST_VERSION="26"
2323

2424
# Use buildkit to match CI as closely as possible.
2525
export DOCKER_BUILDKIT=1

scripts/delete-test-mirror-entries.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ remove_group_from_mirror_yaml() {
4747

4848
TARGET_BLOCK="${block}" perl -0pe '
4949
BEGIN { $removed = 0 }
50-
<<<<<<< HEAD
51-
$removed = s/\Q$ENV{TARGET_BLOCK}\E//s;
52-
=======
5350
$removed = s/\Q$ENV{TARGET_BLOCK}\E\n?//s;
54-
>>>>>>> 32a114d1e5e7c1fe6056f19809f092970d7bd9df
5551
END { exit($removed ? 0 : 44) }
5652
' "${file}" > "${file}.tmp" && mv "${file}.tmp" "${file}"
5753
}

0 commit comments

Comments
 (0)