Optimize units workflow

cloudfoundry · Nov 8, 2024 · aee3a33 · aee3a33
1 parent dfe2201
commit aee3a33
Showing 1 changed file with 10 additions and 37 deletions.
diff --git a/.github/workflows/tests-unit.yml b/.github/workflows/tests-unit.yml
@@ -21,13 +21,9 @@ on:
 permissions:
   contents: read
 
-defaults:
-  run:
-    shell: bash
-
 jobs:
   units:
-    name: Units
+    name: Units (${{ matrix.os }})
     strategy:
       fail-fast: false
       matrix:
@@ -36,35 +32,13 @@ jobs:
           - ubuntu-20.04
           - macos-latest
           - macos-13
-    runs-on: ${{ matrix.os }}
-    steps:
-
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Set Up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version-file: go.mod
-        check-latest: true
-
-    - name: Run Units
-      run: make units
-
-  units-windows:
-    name: Units Windows
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
           - windows-latest
-          - windows-2019
     runs-on: ${{ matrix.os }}
     defaults:
       run:
-        shell: pwsh
-    steps:
+        shell: ${{ matrix.os == 'windows-latest' && 'pwsh' || 'bash' }}
 
+    steps:
     - name: Checkout
       uses: actions/checkout@v4
 
@@ -73,14 +47,13 @@ jobs:
       with:
         go-version-file: go.mod
         check-latest: true
+        cache: true
 
-    - name: Get build-time dependencies
-      run: |
-        choco install --no-progress --limit-output -y make
+    - name: Install Windows Dependencies
+      if: matrix.os == 'windows-latest'
+      run: choco install --no-progress --limit-output -y make
+
+    - name: Run Units
+      run: make units
 
-    - name: Run Windows Units
-      run: |
-        Get-Command make
-        Get-Item Makefile
-        make units
 # vim: set sw=2 ts=2 sts=2 et tw=78 foldlevel=2 fdm=indent nospell: