From 94210c1cac822016e5d54d045a5b350f9f3abea1 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 26 Jul 2024 10:26:52 +0100 Subject: [PATCH 1/8] Update temurin8 Cask for jdk8u422-b05.1 point release re-build Signed-off-by: Andrew Leonard --- Casks/t/temurin@8.rb | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Casks/t/temurin@8.rb b/Casks/t/temurin@8.rb index 8b35fef78f09..c5c44ca7d3e6 100644 --- a/Casks/t/temurin@8.rb +++ b/Casks/t/temurin@8.rb @@ -1,8 +1,15 @@ cask "temurin@8" do - version "8,422,05" - sha256 "1056cbff0f9e2ae23cebbb4f6135a0d8fd9cc62153de629d441d6e765a913a9d" + # NOTE: Last update was for jdk8u422-b05.1 "point release" re-build, next release will need to remove the version.csv.fourth... + # in 4 places: + # version string : remove ",1" + # url : remove ".#{version.csv.fourth}" + # regex : remove "\.(\d+)" + # livecheck strategy version string : remove ",#{match[4]}" - url "https://github.com/adoptium/temurin8-binaries/releases/download/jdk#{version.csv.first}u#{version.csv.second}-b#{version.csv.third}/OpenJDK#{version.csv.first}U-jdk_x64_mac_hotspot_#{version.csv.first}u#{version.csv.second}b#{version.csv.third}.pkg", + version "8,422,05,1" + sha256 "809d7c0b6c7c2fd483711fb784e4fb101ad431c71dc8e96aa9c2cffaa8bfa7b7" + + url "https://github.com/adoptium/temurin8-binaries/releases/download/jdk#{version.csv.first}u#{version.csv.second}-b#{version.csv.third}.#{version.csv.fourth}/OpenJDK#{version.csv.first}U-jdk_x64_mac_hotspot_#{version.csv.first}u#{version.csv.second}b#{version.csv.third}.pkg", verified: "github.com/adoptium/temurin8-binaries/" name "Eclipse Temurin 8" desc "JDK from the Eclipse Foundation (Adoptium)" @@ -10,13 +17,13 @@ livecheck do url "https://api.adoptium.net/v3/assets/feature_releases/8/ga?architecture=x64&image_type=jdk&jvm_impl=hotspot&os=mac&page=0&page_size=1&project=jdk&sort_method=DEFAULT&sort_order=DESC&vendor=eclipse" - regex(/^jdk(\d+)u(\d+)-b(\d+)$/i) + regex(/^jdk(\d+)u(\d+)-b(\d+)\.(\d+)$/i) strategy :json do |json, regex| json.map do |release| match = release["release_name"]&.match(regex) next if match.blank? - "#{match[1]},#{match[2]},#{match[3]}" + "#{match[1]},#{match[2]},#{match[3]},#{match[4]}" end end end From acd4c15f497d97ff27542bebbf8da2c9223fe616 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 26 Jul 2024 10:36:41 +0100 Subject: [PATCH 2/8] Update temurin8 Cask for jdk8u422-b05.1 point release re-build Signed-off-by: Andrew Leonard --- Casks/t/temurin@8.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Casks/t/temurin@8.rb b/Casks/t/temurin@8.rb index c5c44ca7d3e6..525fd96db98d 100644 --- a/Casks/t/temurin@8.rb +++ b/Casks/t/temurin@8.rb @@ -1,10 +1,10 @@ cask "temurin@8" do - # NOTE: Last update was for jdk8u422-b05.1 "point release" re-build, next release will need to remove the version.csv.fourth... - # in 4 places: - # version string : remove ",1" - # url : remove ".#{version.csv.fourth}" - # regex : remove "\.(\d+)" - # livecheck strategy version string : remove ",#{match[4]}" + # NOTE: Last update was for jdk8u422-b05.1 "point release" re-build, next release will need to remove + # the version.csv.fourth etc in 4 places: + # version string : remove ",1" + # url : remove ".#{version.csv.fourth}" + # regex : remove "\.(\d+)" + # livecheck strategy version string : remove ",#{match[4]}" version "8,422,05,1" sha256 "809d7c0b6c7c2fd483711fb784e4fb101ad431c71dc8e96aa9c2cffaa8bfa7b7" From 089f96d72a1cf977468c7f70c3cd1bf6924b6ec4 Mon Sep 17 00:00:00 2001 From: Andrew Leonard <31470007+andrew-m-leonard@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:38:56 +0100 Subject: [PATCH 3/8] Update Casks/t/temurin@8.rb Co-authored-by: Klaus Hipp --- Casks/t/temurin@8.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Casks/t/temurin@8.rb b/Casks/t/temurin@8.rb index 525fd96db98d..3a4dfcb344b0 100644 --- a/Casks/t/temurin@8.rb +++ b/Casks/t/temurin@8.rb @@ -6,10 +6,10 @@ # regex : remove "\.(\d+)" # livecheck strategy version string : remove ",#{match[4]}" - version "8,422,05,1" + version "8,422,05.1" sha256 "809d7c0b6c7c2fd483711fb784e4fb101ad431c71dc8e96aa9c2cffaa8bfa7b7" - url "https://github.com/adoptium/temurin8-binaries/releases/download/jdk#{version.csv.first}u#{version.csv.second}-b#{version.csv.third}.#{version.csv.fourth}/OpenJDK#{version.csv.first}U-jdk_x64_mac_hotspot_#{version.csv.first}u#{version.csv.second}b#{version.csv.third}.pkg", + url "https://github.com/adoptium/temurin8-binaries/releases/download/jdk#{version.csv.first}u#{version.csv.second}-b#{version.csv.third}/OpenJDK#{version.csv.first}U-jdk_x64_mac_hotspot_#{version.csv.first}u#{version.csv.second}b#{version.csv.third.split(".").first}.pkg", verified: "github.com/adoptium/temurin8-binaries/" name "Eclipse Temurin 8" desc "JDK from the Eclipse Foundation (Adoptium)" From 90443486c4efb498a36c77ad7c306ff8f8b6bb47 Mon Sep 17 00:00:00 2001 From: Andrew Leonard <31470007+andrew-m-leonard@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:39:04 +0100 Subject: [PATCH 4/8] Update Casks/t/temurin@8.rb Co-authored-by: Klaus Hipp --- Casks/t/temurin@8.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/t/temurin@8.rb b/Casks/t/temurin@8.rb index 3a4dfcb344b0..52e71a780a3a 100644 --- a/Casks/t/temurin@8.rb +++ b/Casks/t/temurin@8.rb @@ -17,7 +17,7 @@ livecheck do url "https://api.adoptium.net/v3/assets/feature_releases/8/ga?architecture=x64&image_type=jdk&jvm_impl=hotspot&os=mac&page=0&page_size=1&project=jdk&sort_method=DEFAULT&sort_order=DESC&vendor=eclipse" - regex(/^jdk(\d+)u(\d+)-b(\d+)\.(\d+)$/i) + regex(/^jdk(\d+)u(\d+)-b(\d+(?:\.\d+)*)$/i) strategy :json do |json, regex| json.map do |release| match = release["release_name"]&.match(regex) From d38a6b3bd9c30395b27c0c02db5bccd9781fab45 Mon Sep 17 00:00:00 2001 From: Andrew Leonard <31470007+andrew-m-leonard@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:39:10 +0100 Subject: [PATCH 5/8] Update Casks/t/temurin@8.rb Co-authored-by: Klaus Hipp --- Casks/t/temurin@8.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Casks/t/temurin@8.rb b/Casks/t/temurin@8.rb index 52e71a780a3a..f01c9c257e2c 100644 --- a/Casks/t/temurin@8.rb +++ b/Casks/t/temurin@8.rb @@ -23,7 +23,7 @@ match = release["release_name"]&.match(regex) next if match.blank? - "#{match[1]},#{match[2]},#{match[3]},#{match[4]}" + "#{match[1]},#{match[2]},#{match[3]}" end end end From d17e99b5b230ba795ef7df823389c2562fc6db62 Mon Sep 17 00:00:00 2001 From: Andrew Leonard <31470007+andrew-m-leonard@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:39:30 +0100 Subject: [PATCH 6/8] Update Casks/t/temurin@8.rb Co-authored-by: Klaus Hipp From dafca99e52e17da128cd58e4cf1961a7f819eba8 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Tue, 30 Jul 2024 14:41:56 +0100 Subject: [PATCH 7/8] Update temurin8 Cask for jdk8u422-b05.1 point release re-build Signed-off-by: Andrew Leonard --- Casks/t/temurin@8.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Casks/t/temurin@8.rb b/Casks/t/temurin@8.rb index f01c9c257e2c..03d215204924 100644 --- a/Casks/t/temurin@8.rb +++ b/Casks/t/temurin@8.rb @@ -1,10 +1,4 @@ cask "temurin@8" do - # NOTE: Last update was for jdk8u422-b05.1 "point release" re-build, next release will need to remove - # the version.csv.fourth etc in 4 places: - # version string : remove ",1" - # url : remove ".#{version.csv.fourth}" - # regex : remove "\.(\d+)" - # livecheck strategy version string : remove ",#{match[4]}" version "8,422,05.1" sha256 "809d7c0b6c7c2fd483711fb784e4fb101ad431c71dc8e96aa9c2cffaa8bfa7b7" From 5f59f55747c851954ea5adc17cfa92712f125cd0 Mon Sep 17 00:00:00 2001 From: Klaus Hipp Date: Tue, 30 Jul 2024 16:37:28 +0200 Subject: [PATCH 8/8] temurin@8: fix filename --- Casks/t/temurin@8.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Casks/t/temurin@8.rb b/Casks/t/temurin@8.rb index 03d215204924..bbc9fd7e913c 100644 --- a/Casks/t/temurin@8.rb +++ b/Casks/t/temurin@8.rb @@ -1,5 +1,4 @@ cask "temurin@8" do - version "8,422,05.1" sha256 "809d7c0b6c7c2fd483711fb784e4fb101ad431c71dc8e96aa9c2cffaa8bfa7b7" @@ -22,7 +21,7 @@ end end - pkg "OpenJDK#{version.csv.first}U-jdk_x64_mac_hotspot_#{version.csv.first}u#{version.csv.second}b#{version.csv.third}.pkg" + pkg "OpenJDK#{version.csv.first}U-jdk_x64_mac_hotspot_#{version.csv.first}u#{version.csv.second}b#{version.csv.third.split(".").first}.pkg" uninstall pkgutil: "net.temurin.#{version.csv.first}.jdk"