Gå og legg deg!

erikbra · Feb 26, 2024 · 4872528 · 4872528
1 parent 32c32f0
commit 4872528
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -317,43 +317,53 @@ jobs:
  - set-version-number
  - build-standalone
 
- runs-on: ubuntu-latest
  strategy:
  matrix:
  category: [ "CommandLine.SqlServer", "CommandLine.PostgreSQL", 
  "CommandLine.MariaDB", "CommandLine.Sqlite", "CommandLine.Oracle" ]
- arch: [ "linux" ]
+ os: [windows-latest, ubuntu-latest, macos-latest]
+ include:
+ - os: windows-latest
+ executable: grate.exe
+ arch: win-x64
+ - os: linux-latest
+ executable: grate
+ arch: linux-x64
+ - os: macos-latest
+ executable: grate
+ arch: osx-x64
  #arch: [ "linux", "win", "macos" ]
  # arch: [ "win-x64", "win-x86", "win-arm64",
  # "linux-musl-x64", "linux-musl-arm64", "linux-x64", "linux-arm64",
  # "osx-x64", "osx-arm64"
  # ]
 
+ runs-on: ${{ matrix.os }}
  steps:
  - uses: actions/checkout@v4
  - uses: actions/download-artifact@v3
  with:
- name: grate-${{ matrix.arch }}-x64-self-contained-${{ needs.set-version-number.outputs.nuGetVersion }}
+ name: grate-${{ matrix.arch }}-self-contained-${{ needs.set-version-number.outputs.nuGetVersion }}
  #name: grate-linux-musl-x64-self-contained-${{ needs.set-version-number.outputs.nuGetVersion }}
- path: executables/${{ matrix.arch }}-x64
+ path: executables/${{ matrix.arch }}
  - name: Setup .NET 8
  uses: actions/setup-dotnet@v4
  with:
  dotnet-version: 8.0.x
 
  - name: chmod u+x
  run: chmod u+x $GrateExecutablePath
- if: ${{ matrix.arch == 'linux' }}
+ if: ${{ matrix.arch != 'win-x64' }}
  env:
- GrateExecutablePath: ${{ github.workspace }}/executables/${{ matrix.arch }}-x64/grate
+ GrateExecutablePath: ${{ github.workspace }}/executables/${{ matrix.arch }}/${{ matrix.executable }}
  - name: Test
  run: |
  dotnet test \
  unittests/CommandLine/${{ matrix.category }} \
- --logger:"xunit;LogFilePath=/tmp/test-results/${{ matrix.category }}.xml" -- \
+ --logger:"xunit;LogFilePath=/tmp/test-results/${{ matrix.arch }}/${{ matrix.category }}.xml" -- \
  -MaxCpuCount 2
  env:
  LogLevel: Warning
- GrateExecutablePath: ${{ github.workspace }}/executables/${{ matrix.arch }}-x64/grate
+ GrateExecutablePath: ${{ github.workspace }}/executables/${{ matrix.arch }}/${{ matrix.executable }}
  TZ: UTC