#318 Separate Failure handling on Windows and Unixes

; Conflicts: ; .github/workflows/build-artifacts.yml ; .github/workflows/test-java-os-mix.yml
aim42 · Dec 14, 2024 · a060f56 · a060f56
1 parent 660c3b9
commit a060f56
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml
@@ -75,8 +75,8 @@ jobs:
           path: |
             **/build
 
-      - name: Collect state upon failure
-        if: failure()
+      - name: Collect state upon failure (On Unix)
+        if: failure() && runner.os != 'Windows'
         run: |
           echo "Git:"
           git status
@@ -87,3 +87,16 @@ jobs:
           echo "Files:"
           find * -ls
           ./gradlew javaToolchains
+
+      - name: Collect state upon failure (On Windows)
+        if: failure() && runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          echo "Git:"
+          git status
+          echo "Env:"
+          env
+          echo "PWD:"
+          pwd
+          echo "Files:"
+          Get-ChildItem -Recurse -File | Format-Table Name, Length, LastWriteTime
diff --git a/.github/workflows/test-java-os-mix.yml b/.github/workflows/test-java-os-mix.yml
@@ -57,12 +57,8 @@ jobs:
           cmd /c "echo off && gradlew.bat --version"
           cmd /c "echo off && gradlew.bat htmlSanityCheck --scan"
 
-        # If we ever need to debug the file system contents
-        #   Get-ChildItem -Recurse -File | Format-Table Name, Length, LastWriteTime
-        #   Get-ChildItem -Recurse -File ./integration-test | Format-Table Name, Length, LastWriteTime
-
-      - name: Collect state upon failure
-        if: failure()
+      - name: Collect state upon failure (On Unix)
+        if: failure() && runner.os != 'Windows'
         run: |
           echo "Git:"
           git status
@@ -74,3 +70,16 @@ jobs:
           find * -ls
           ./gradlew javaToolchains
           
+
+      - name: Collect state upon failure (On Windows)
+        if: failure() && runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          echo "Git:"
+          git status
+          echo "Env:"
+          env
+          echo "PWD:"
+          pwd
+          echo "Files:"
+          Get-ChildItem -Recurse -File | Format-Table Name, Length, LastWriteTime