Bump setup-java to v4

pulumi · Jul 3, 2024 · 540e5bd · 540e5bd
1 parent 49114d3
commit 540e5bd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,12 +47,16 @@ jobs:
       id-token: write
     steps:
       - name: Install Java 11 (temurin)
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
+      - if: contains(matrix.platform, 'macOS')
+        name: Install sbt (Scala)
+        run: |
+          brew install sbt
       - name: Install DotNet ${{ matrix.dotnet }}
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ matrix.dotnet }}
       - if: contains(matrix.platform, 'ubuntu') || contains(matrix.platform, 'windows')

diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -2,6 +2,9 @@ name: Run Template Tests Against Pulumi CLI
 on:
   schedule:
     - cron: '0 8 * * *'
+  pull_request:
+    branches:
+      - master
   workflow_dispatch: {}
 
 env:
@@ -44,12 +47,16 @@ jobs:
       id-token: write
     steps:
       - name: Install Java 11 (temurin)
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
+      - if: contains(matrix.platform, 'macOS')
+        name: Install sbt (Scala)
+        run: |
+          brew install sbt
       - name: Install DotNet ${{ matrix.dotnet }}
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ matrix.dotnet }}
       - if: contains(matrix.platform, 'ubuntu') || contains(matrix.platform, 'windows')

diff --git a/.github/workflows/run-templates-command.yml b/.github/workflows/run-templates-command.yml
@@ -53,12 +53,16 @@ jobs:
       id-token: write
     steps:
       - name: Install Java 11 (temurin)
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
+      - if: contains(matrix.platform, 'macOS')
+        name: Install sbt (Scala)
+        run: |
+          brew install sbt
       - name: Install DotNet ${{ matrix.dotnet }}
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ matrix.dotnet }}
       - if: contains(matrix.platform, 'ubuntu') || contains(matrix.platform, 'windows')