Merge branch 'master' of https://github.com/pardeike/Harmony

pardeike · Feb 19, 2024 · 2457353 · 2457353
2 parents ca21a76 + 32e3f7b
commit 2457353
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 32 deletions.
diff --git a/.github/actions/test-execute-test/action.yml b/.github/actions/test-execute-test/action.yml
@@ -82,14 +82,28 @@ runs:
         }
       shell: pwsh
 
-    - name: Perform Tests Windows .NET | Ubuntu/MacOS/MacOS-arm64 .NET/Mono
-      if: ${{(inputs.os == 'windows' && inputs.runtime-type == 'dotnet') || inputs.os == 'ubuntu' || inputs.os == 'macos' || inputs.os == 'macos-arm64'}}
+    - name: Perform Tests Windows .NET | Ubuntu .NET/Mono
+      if: ${{(inputs.os == 'windows' && inputs.runtime-type == 'dotnet') || inputs.os == 'ubuntu'}}
       run: |
         foreach ($target_framework in ConvertFrom-Json "${{steps.test-args.outputs.target_frameworks}}") {
           dotnet test "HarmonyTests/bin/Release/$target_framework/HarmonyTests.dll" -f $target_framework ${{steps.test-args.outputs.dotnet}} -- ${{steps.test-args.outputs.run_settings_args}};
         }
       shell: pwsh
 
+    # Not sure if continue_on_error: true is needed
+    - name: Perform Tests MacOS/MacOS-arm64 .NET/Mono
+      uses: nick-fields/retry@v3
+      if: ${{inputs.os == 'macos' || inputs.os == 'macos-arm64'}}
+      with:
+        timeout_minutes: 3
+        max_attempts: 3
+        retry_on: timeout
+        command: |
+          foreach ($target_framework in ConvertFrom-Json "${{steps.test-args.outputs.target_frameworks}}") {
+            dotnet test "HarmonyTests/bin/Release/$target_framework/HarmonyTests.dll" -f $target_framework ${{steps.test-args.outputs.dotnet}} -- ${{steps.test-args.outputs.run_settings_args}};
+          }
+        shell: pwsh
+
     - name: Upload Test Result
       uses: ./.github/actions/test-upload-result
       if: ${{(inputs.upload_tests == 'true') && (always() || failure())}}

diff --git a/.github/actions/test-setup-mono-windows/action.yml b/.github/actions/test-setup-mono-windows/action.yml
@@ -14,28 +14,8 @@ outputs:
 runs:
   using: "composite"
   steps:
-    - name: Setup Mono x86 Manually
-      if: inputs.architecture == 'x86'
-      run: |
-        curl -L https://download.mono-project.com/archive/mono-latest-x86-preview.msi -o mono.msi;
-        $file = "mono.msi" 
-        $log = "install.log"
-        $procMain = Start-Process "msiexec" "/i `"$file`" /qn /l*! `"$log`"" -NoNewWindow -PassThru
-        $procLog = Start-Process "powershell" "Get-Content -Path `"$log`" -Wait" -NoNewWindow -PassThru
-        $procMain.WaitForExit()
-        $procLog.Kill()
-      shell: pwsh
-
-    - name: Setup Mono x64 Manually
-      if: inputs.architecture == 'x64'
-      run: |
-        curl -L https://download.mono-project.com/archive/mono-latest-x64-preview.msi -o mono.msi;
-        $file = "mono.msi" 
-        $log = "install.log"
-        $procMain = Start-Process "msiexec" "/i `"$file`" /qn /l*! `"$log`"" -NoNewWindow -PassThru
-        $procLog = Start-Process "powershell" "Get-Content -Path `"$log`" -Wait" -NoNewWindow -PassThru
-        $procMain.WaitForExit()
-        $procLog.Kill()
+    - name: Setup Mono
+      run: choco install mono --yes --no-progress --${{inputs.architecture}} --ignore-checksums
       shell: pwsh
 
     - name: Get Program Files path for ${{inputs.architecture}}

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -40,7 +40,7 @@ jobs:
     name: Upload Test Build Output Cache
     runs-on: ${{inputs.image}}
     if: ${{!inputs.manual_build || inputs.publish}}
-    timeout-minutes: 8
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/test-qemu-dotnet.yml b/.github/workflows/test-qemu-dotnet.yml
@@ -39,7 +39,7 @@ jobs:
     name: .NET ubuntu-arm64 ${{ inputs.target_framework }} ${{ inputs.build_configuration }}
     runs-on: ubuntu-latest
     continue-on-error: ${{inputs.experimental}}
-    timeout-minutes: 8
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/test-qemu-mono.yml b/.github/workflows/test-qemu-mono.yml
@@ -39,7 +39,7 @@ jobs:
     name: Mono ubuntu-arm64 ${{ inputs.target_framework }} ${{ inputs.build_configuration }}
     runs-on: ubuntu-latest
     continue-on-error: ${{inputs.experimental}}
-    timeout-minutes: 8
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/test-unix-dotnet.yml b/.github/workflows/test-unix-dotnet.yml
@@ -56,7 +56,7 @@ jobs:
     name: .NET ${{inputs.os}}-${{inputs.architecture}} ${{ inputs.target_framework }} ${{inputs.build_configuration}}
     runs-on: ${{inputs.image}}
     continue-on-error: ${{inputs.experimental}}
-    timeout-minutes: 8
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/test-unix-mono.yml b/.github/workflows/test-unix-mono.yml
@@ -56,7 +56,7 @@ jobs:
     name: Mono ${{ inputs.os }}-${{ inputs.architecture }} ${{ inputs.target_framework }} ${{ inputs.build_configuration }}
     runs-on: ${{inputs.image}}
     continue-on-error: ${{inputs.experimental}}
-    timeout-minutes: 8
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/test-windows-dotnet.yml b/.github/workflows/test-windows-dotnet.yml
@@ -48,7 +48,7 @@ jobs:
     name: .NET ${{ inputs.architecture }} ${{ inputs.target_framework }} ${{ inputs.build_configuration }}
     runs-on: windows-latest
     continue-on-error: ${{inputs.experimental}}
-    timeout-minutes: 8
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/test-windows-framework.yml b/.github/workflows/test-windows-framework.yml
@@ -48,7 +48,7 @@ jobs:
     name: .NET FX ${{ inputs.architecture }} ${{ inputs.target_framework }} ${{ inputs.build_configuration }}
     runs-on: windows-2019
     continue-on-error: ${{inputs.experimental}}
-    timeout-minutes: 8
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/test-windows-mono.yml b/.github/workflows/test-windows-mono.yml
@@ -48,7 +48,7 @@ jobs:
     name: Mono ${{ inputs.architecture }} ${{ inputs.target_framework }} ${{ inputs.build_configuration }}
     runs-on: windows-latest
     continue-on-error: ${{inputs.experimental}}
-    timeout-minutes: 8
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4