Migrate to new arch checks and verify installations on x64 Mac

https://docs.brew.sh/Cask-Cookbook#handling-different-system-configurations
mdogan · Sep 4, 2024 · 39aa3d9 · 39aa3d9
1 parent e488679
commit 39aa3d9
Show file tree

Hide file tree

Showing 25 changed files with 183 additions and 67 deletions.
diff --git a/.github/workflows/jdk10.yml b/.github/workflows/jdk10.yml
@@ -16,9 +16,16 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-12 is based on x64.
+          - macos-12
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/.github/workflows/jdk11.yml b/.github/workflows/jdk11.yml
@@ -16,9 +16,16 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-12 is based on x64.
+          - macos-12
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/.github/workflows/jdk13.yml b/.github/workflows/jdk13.yml
@@ -16,9 +16,16 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-12 is based on x64.
+          - macos-12
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/.github/workflows/jdk14.yml b/.github/workflows/jdk14.yml
@@ -16,9 +16,16 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-12 is based on x64.
+          - macos-12
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/.github/workflows/jdk15.yml b/.github/workflows/jdk15.yml
@@ -16,9 +16,16 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-12 is based on x64.
+          - macos-12
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/.github/workflows/jdk16.yml b/.github/workflows/jdk16.yml
@@ -16,9 +16,16 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-12 is based on x64.
+          - macos-12
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/.github/workflows/jdk17.yml b/.github/workflows/jdk17.yml
@@ -16,9 +16,16 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-12 is based on x64.
+          - macos-12
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/.github/workflows/jdk18.yml b/.github/workflows/jdk18.yml
@@ -16,9 +16,16 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-12 is based on x64.
+          - macos-12
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/.github/workflows/jdk19.yml b/.github/workflows/jdk19.yml
@@ -16,9 +16,16 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-12 is based on x64.
+          - macos-12
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/.github/workflows/jdk21.yml b/.github/workflows/jdk21.yml
@@ -16,9 +16,16 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-12 is based on x64.
+          - macos-12
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/.github/workflows/jdk22.yml b/.github/workflows/jdk22.yml
@@ -16,9 +16,16 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-12 is based on x64.
+          - macos-12
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/.github/workflows/jdk7.yml b/.github/workflows/jdk7.yml
@@ -16,9 +16,16 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-12 is based on x64.
+          - macos-12
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/.github/workflows/jdk8.yml b/.github/workflows/jdk8.yml
@@ -16,9 +16,16 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-12 is based on x64.
+          - macos-12
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/.github/workflows/jdk9.yml b/.github/workflows/jdk9.yml
@@ -16,9 +16,16 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-12 is based on x64.
+          - macos-12
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/Casks/zulu-jdk11.rb b/Casks/zulu-jdk11.rb
@@ -1,14 +1,15 @@
 cask 'zulu-jdk11' do
 
-  if Hardware::CPU.intel?
+  on_intel do
     version '11.74.15,11.0.24'
     sha256 '7c8e9cc1ee9b62f3faa902fae0f860578d833d2f0c9cd7c8a1ea84b6fd4cddf1'
 
     url 'https://cdn.azul.com/zulu/bin/zulu11.74.15-ca-jdk11.0.24-macosx_x64.dmg',
         referer: 'https://www.azul.com/downloads/zulu-community/'
 
     depends_on macos: '>= :mojave'
-  else
+  end
+  on_arm do
     version '11.74.15,11.0.24'
     sha256 'cc3848ec9a540ed445f21264a05d82f2a8207e26f0e4a311fed23550873468f8'
 

diff --git a/Casks/zulu-jdk13.rb b/Casks/zulu-jdk13.rb
@@ -1,14 +1,15 @@
 cask 'zulu-jdk13' do
 
-  if Hardware::CPU.intel?
+  on_intel do
     version '13.54.17,13.0.14'
     sha256 'e83a0fb55f3d736c88d9fff33ee6c4a11901507a932477df15bed220c84714c4'
 
     url 'https://cdn.azul.com/zulu/bin/zulu13.54.17-ca-jdk13.0.14-macosx_x64.dmg',
         referer: 'https://www.azul.com/downloads/zulu-community/'
 
     depends_on macos: '>= :mojave'
-  else
+  end
+  on_arm do
     version '13.54.17,13.0.14'
     sha256 'b7b41f43f6a76f84d579e1d7b4abfd536928b6472e0ca3a8188f474235137b8e'
 

diff --git a/Casks/zulu-jdk15.rb b/Casks/zulu-jdk15.rb
@@ -1,14 +1,15 @@
 cask 'zulu-jdk15' do
 
-  if Hardware::CPU.intel?
+  on_intel do
     version '15.46.17,15.0.10'
     sha256 '9e8a2b162826af9ac9db248e4c9e7a8983bbe31ae63686a19a3c291770f9427c'
 
     url 'https://cdn.azul.com/zulu/bin/zulu15.46.17-ca-jdk15.0.10-macosx_x64.dmg',
         referer: 'https://www.azul.com/downloads/zulu-community/'
 
     depends_on macos: '>= :mojave'
-  else
+  end
+  on_arm do
     version '15.46.17,15.0.10'
     sha256 'f5d123cd149f245792d0d807086f4c58c493bd52db8162ed2d2609f97e493ac1'
 

diff --git a/Casks/zulu-jdk16.rb b/Casks/zulu-jdk16.rb
@@ -1,14 +1,15 @@
 cask 'zulu-jdk16' do
 
-  if Hardware::CPU.intel?
+  on_intel do
     version '16.32.15,16.0.2'
     sha256 '59dcf9c1c5ac4acbf27319c2dfb38fd26c97663dbac1a1d931fb94cec6864de2'
 
     url 'https://cdn.azul.com/zulu/bin/zulu16.32.15-ca-jdk16.0.2-macosx_x64.dmg',
         referer: 'https://www.azul.com/downloads/zulu-community/'
 
     depends_on macos: '>= :mojave'
-  else
+  end
+  on_arm do
     version '16.32.15,16.0.2'
     sha256 'f6c6ff8d6afdb45040ef8dac4b0c0798f4938bd10e82b0edd54bfd58e8b74032'
 

diff --git a/Casks/zulu-jdk17.rb b/Casks/zulu-jdk17.rb
@@ -1,14 +1,15 @@
 cask 'zulu-jdk17' do
 
-  if Hardware::CPU.intel?
+  on_intel do
     version '17.52.17,17.0.12'
     sha256 '695cf191aedfa6e159d7ed6825de66a6124af1886cbb4f3bb6d2478fce8e528c'
 
     url 'https://cdn.azul.com/zulu/bin/zulu17.52.17-ca-jdk17.0.12-macosx_x64.dmg',
         referer: 'https://www.azul.com/downloads/zulu-community/'
 
     depends_on macos: '>= :mojave'
-  else
+  end
+  on_arm do
     version '17.52.17,17.0.12'
     sha256 '807ecb2a1cf69723ac03aaec2883dbe54d5537ae1c245c4de6d3d2ece56d29b5'
 

diff --git a/Casks/zulu-jdk18.rb b/Casks/zulu-jdk18.rb
@@ -1,14 +1,15 @@
 cask 'zulu-jdk18' do
 
-  if Hardware::CPU.intel?
+  on_intel do
     version '18.32.13,18.0.2.1'
     sha256 'fdba26f51f1f8a82cb1e084bc11c65136fca5cb5f653146c8e575787ca9fab34'
 
     url 'https://cdn.azul.com/zulu/bin/zulu18.32.13-ca-jdk18.0.2.1-macosx_x64.dmg',
         referer: 'https://www.azul.com/downloads/zulu-community/'
 
     depends_on macos: '>= :mojave'
-  else
+  end
+  on_arm do
     version '18.32.13,18.0.2.1'
     sha256 'aa25a85a8a3e51b2a532753aaf1c8151f8af671d8885c4cc1e245cc2de523f6c'