Update pinned casks and workflows

mdogan · Jan 20, 2025 · 6cc3c24 · 6cc3c24
1 parent f1ae3b3
commit 6cc3c24
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 19 deletions.
diff --git a/.github/workflows/jdk12.yml b/.github/workflows/jdk12.yml
@@ -3,7 +3,7 @@ name: JDK12
 on:
   push:
     branches:
-      - '**'
+      - master
     paths:
       - '.github/workflows/jdk12.yml'
       - 'Casks/zulu-jdk12.rb'
@@ -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-13 is based on x64.
+          - macos-13
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/.github/workflows/jdk20.yml b/.github/workflows/jdk20.yml
@@ -16,9 +16,19 @@ on:
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-13 is based on x64.
+          - macos-13
+    runs-on: ${{ matrix.os }}
+    env:
+      HOMEBREW_COLOR: 1
+      HOMEBREW_DEVELOPER: 1
     steps:
 
       - name: Check out
@@ -30,9 +40,6 @@ jobs:
           brew update-reset "$(brew --repository homebrew/cask)"
           mkdir -p $(brew --repo)/Library/Taps/mdogan
           ln -s $GITHUB_WORKSPACE $(brew --repo)/Library/Taps/mdogan/homebrew-zulu
-        env:
-          HOMEBREW_COLOR: 1
-          HOMEBREW_DEVELOPER: 1
 
       - name: install jdk20
         run: brew install zulu-jdk20

diff --git a/.github/workflows/mc.yml b/.github/workflows/mc.yml
@@ -5,18 +5,27 @@ on:
     branches:
       - master
     paths:
+      - '.github/workflows/mc.yml'
       - 'Casks/zulu-mc.rb'
   pull_request:
     branches:
       - master
     paths:
+      - '.github/workflows/mc.yml'
       - 'Casks/zulu-mc.rb'
 
 jobs:
 
-  build:
-    name: Build
-    runs-on: macos-latest
+  check:
+    name: Check
+    strategy:
+      matrix:
+        os:
+          # macos-latest is based on arm64.
+          - macos-latest
+          # macos-13 is based on x64.
+          - macos-13
+    runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_COLOR: 1
       HOMEBREW_DEVELOPER: 1

diff --git a/Casks/zulu-jdk20.rb b/Casks/zulu-jdk20.rb
@@ -1,14 +1,15 @@
 cask 'zulu-jdk20' do
 
-  if Hardware::CPU.intel?
+  on_intel do
     version '20.32.11,20.0.2'
     sha256 '6f02981801832230edd0a0091b8de10873d3271cd7cc4d7a9ed439b046fa4b1f'
 
     url 'https://cdn.azul.com/zulu/bin/zulu20.32.11_1-ca-jdk20.0.2-macosx_x64.dmg',
         referer: 'https://www.azul.com/downloads/zulu-community/'
 
     depends_on macos: '>= :mojave'
-  else
+  end
+  on_arm do
     version '20.32.11,20.0.2'
     sha256 'c5c196a0a25eca25a22edee325ff8ee2cd96aa9bfdee0ca3554dfbfd31dba8df'
 

diff --git a/Casks/zulu-mc.rb b/Casks/zulu-mc.rb
@@ -3,7 +3,7 @@
   name 'Zulu® Mission Control'
   homepage 'https://www.azul.com/products/zulu-mission-control/'
 
-  if Hardware::CPU.intel?
+  on_intel do
     version '8.3.1.81-ca'
     sha256 :no_check
 
@@ -13,8 +13,8 @@
     depends_on macos: '>= :mojave'
 
     app "zmc#{version}-macos_x64/Azul Mission Control.app"
-
-  else
+  end
+  on_arm do
     version '8.3.1.81-ca'
     sha256 :no_check
 
@@ -24,6 +24,6 @@
     depends_on macos: '>= :big_sur'
 
     app "zmc#{version}-macos_aarch64/Azul Mission Control.app"
-  end  
+  end
 
 end