From 8edfde229b45ba261103d1aca0b59c1ab5068667 Mon Sep 17 00:00:00 2001 From: June Rhodes Date: Thu, 31 Oct 2024 11:41:41 +1100 Subject: [PATCH] Add library build, test, package and StringEnum tests to GitHub Actions --- .github/workflows/uet.yml | 194 +++++++++++++++++++- Build/.platform-autodiscovery.gitlab-ci.yml | 66 ------- Build/.platform-maclogging.gitlab-ci.yml | 16 -- Build/.stringenum.gitlab-ci.yml | 20 -- Build/.uefs-client.gitlab-ci.yml | 36 ---- Build/.uefs-daemon.gitlab-ci.yml | 34 ---- Build/.uet-lib.gitlab-ci.yml | 64 ------- Build/.uet-pass-1.gitlab-ci.yml | 36 ---- Build/.uet-shim.gitlab-ci.yml | 30 --- 9 files changed, 193 insertions(+), 303 deletions(-) delete mode 100644 Build/.platform-autodiscovery.gitlab-ci.yml delete mode 100644 Build/.platform-maclogging.gitlab-ci.yml delete mode 100644 Build/.stringenum.gitlab-ci.yml delete mode 100644 Build/.uefs-client.gitlab-ci.yml delete mode 100644 Build/.uefs-daemon.gitlab-ci.yml delete mode 100644 Build/.uet-lib.gitlab-ci.yml delete mode 100644 Build/.uet-pass-1.gitlab-ci.yml delete mode 100644 Build/.uet-shim.gitlab-ci.yml diff --git a/.github/workflows/uet.yml b/.github/workflows/uet.yml index a43af3e0..8cbc8ec7 100644 --- a/.github/workflows/uet.yml +++ b/.github/workflows/uet.yml @@ -195,6 +195,30 @@ jobs: UET/Redpoint.Logging.Mac.Native/runtimes/osx-x64/libLogging.x64.dylib UET/Redpoint.Logging.Mac/bin/Redpoint.Logging.Mac.Native.*.nupkg + test-stringenum-trimmed: + name: "Test StringEnum Trimmed" + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Build and Test + shell: pwsh + run: | + sudo apt-get update + sudo apt-get install -y clang zlib1g-dev dotnet-sdk-8.0 + dotnet publish /p:TargetFramework=net8.0 -c Release -r linux-x64 UET/Redpoint.StringEnum.TrimTests/Redpoint.StringEnum.TrimTests.csproj + if ($LastExitCode -ne 0) { + Write-Host "dotnet build (Redpoint.StringEnum.TrimTests.csproj) failed with exit code $LastExitCode" + exit $LastExitCode + } + UET/Redpoint.StringEnum.TrimTests/bin/Release/net8.0/linux-x64/publish/Redpoint.StringEnum.TrimTests + if ($LastExitCode -ne 0) { + Write-Host "Redpoint.StringEnum.TrimTests failed with exit code $LastExitCode" + exit $LastExitCode + } + pass-1-win: name: "Build Windows Pass 1" runs-on: windows-latest @@ -440,4 +464,172 @@ jobs: UET/Redpoint.Uefs.Daemon/bin/Release/net8.0/osx-arm64/publish/uefs-daemon UET/uet.shim/bin/Release/net8.0/osx-arm64/publish/uet UET/uet/bin/Release/net8.0/osx-arm64/publish/uet - \ No newline at end of file + + libs-win: + name: "Build and Test Libraries on Windows" + runs-on: windows-latest + needs: + - timestamp + - prereq-autodiscovery + - prereq-mac-logging + env: + UET_PACKAGE_VERSION: ${{ needs.timestamp.outputs.version }} + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Cache .NET SDK + id: cache-sdk + uses: actions/cache@v4 + with: + key: dotnet-sdk-windows-${{ env.UET_FRAMEWORK_TARGET }} + restore-keys: dotnet-sdk-windows-${{ env.UET_FRAMEWORK_TARGET }} + path: .dotnet-${{ env.UET_FRAMEWORK_TARGET }} + - if: ${{ steps.cache-sdk.outputs.cache-hit != 'true' }} + name: Download .NET SDK + shell: pwsh + run: | + if (!(Test-Path .dotnet-${env:UET_FRAMEWORK_TARGET}\dotnet\dotnet-extracted)) { + if (Test-Path ".dotnet-${env:UET_FRAMEWORK_TARGET}") { + Remove-Item -Recurse -Force ".dotnet-${env:UET_FRAMEWORK_TARGET}" + } + Write-Host "Setting up .NET SDK..." + New-Item -ItemType Directory ".dotnet-${env:UET_FRAMEWORK_TARGET}" | Out-Null + curl.exe -L -o ".dotnet-${env:UET_FRAMEWORK_TARGET}\dotnet.zip" "${env:UET_DOTNET_WIN_DL}" + if ($LastExitCode -ne 0) { + exit $LastExitCode + } + Expand-Archive -Path ".dotnet-${env:UET_FRAMEWORK_TARGET}\dotnet.zip" -DestinationPath ".dotnet-${env:UET_FRAMEWORK_TARGET}\dotnet" -Force | Out-Null + Set-Content -Path .dotnet-${env:UET_FRAMEWORK_TARGET}\dotnet\dotnet-extracted -Value "done" + } + - name: Add .NET SDK to PATH + shell: pwsh + run: | + Add-Content -Path "${env:GITHUB_PATH}" -Value ".dotnet-${env:UET_FRAMEWORK_TARGET}\dotnet" + - name: Download AutoDiscovery + uses: actions/download-artifact@v4 + with: + name: autodiscovery-nupkg + path: UET/Redpoint.AutoDiscovery/bin/Release/ + merge-multiple: true + - name: Download Mac Logging + uses: actions/download-artifact@v4 + with: + name: mac-logging-nupkg + path: UET/ + merge-multiple: true + - name: Build and Test Libraries on Windows + shell: pwsh + run: | + dotnet build -c Release "/p:PackageVersion=${env:UET_PACKAGE_VERSION}" UET/UET.sln + if ($LastExitCode -ne 0) { + Write-Host "dotnet build (UET.sln) failed with exit code $LastExitCode" + exit $LastExitCode + } + foreach ($Item in (Get-ChildItem UET -Filter *.Tests)) { + if (Test-Path "$($Item.FullName)/$($Item.Name).csproj") { + Write-Host "============ STARTING: $($Item.Name) ============" + dotnet test --logger:"console" --logger:"trx;LogFilePath=$((Get-Location).Path)\TestResults\$($Item.Name).test-result.trx" "$($Item.FullName)/bin/Release/net8.0/$($Item.Name).dll" + if ($LastExitCode -ne 0) { + Write-Host "============ FAILED: $($Item.Name) ============" + exit $LastExitCode + } + Write-Host "============ PASSED: $($Item.Name) ============" + } + } + - name: Report Test Results + uses: dorny/test-reporter@v1 + if: success() || failure() + with: + name: Windows Test Results + path: TestResults/*.test-result.trx + reporter: dotnet-trx + - name: Upload Packages + uses: actions/upload-artifact@v4 + with: + name: libs-win + if-no-files-found: error + path: | + **/*.nupkg + + libs-mac: + name: "Build and Test Libraries on macOS" + runs-on: macos-latest + needs: + - timestamp + - prereq-autodiscovery + - prereq-mac-logging + env: + UET_PACKAGE_VERSION: ${{ needs.timestamp.outputs.version }} + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Cache .NET SDK + id: cache-sdk + uses: actions/cache@v4 + with: + key: dotnet-sdk-windows-${{ env.UET_FRAMEWORK_TARGET }} + restore-keys: dotnet-sdk-windows-${{ env.UET_FRAMEWORK_TARGET }} + path: .dotnet-${{ env.UET_FRAMEWORK_TARGET }} + - if: ${{ steps.cache-sdk.outputs.cache-hit != 'true' }} + name: Download .NET SDK + shell: pwsh + run: | + if (!(Test-Path .dotnet-${env:UET_FRAMEWORK_TARGET}/dotnet/dotnet-extracted)) { + if (Test-Path ".dotnet-${env:UET_FRAMEWORK_TARGET}") { + Remove-Item -Recurse -Force ".dotnet-${env:UET_FRAMEWORK_TARGET}" + } + Write-Host "Setting up .NET SDK..." + New-Item -ItemType Directory ".dotnet-${env:UET_FRAMEWORK_TARGET}" | Out-Null + curl -L -o ".dotnet-${env:UET_FRAMEWORK_TARGET}/dotnet.tar.gz" "${env:UET_DOTNET_MAC_DL}" + if ($LastExitCode -ne 0) { + exit $LastExitCode + } + New-Item -ItemType Directory ".dotnet-${env:UET_FRAMEWORK_TARGET}/dotnet" | Out-Null + Push-Location ".dotnet-${env:UET_FRAMEWORK_TARGET}/dotnet" + try { + tar -xvf "../dotnet.tar.gz" + } finally { + Pop-Location + } + Set-Content -Path .dotnet-${env:UET_FRAMEWORK_TARGET}/dotnet/dotnet-extracted -Value "done" + } + - name: Add .NET SDK to PATH + shell: pwsh + run: | + Add-Content -Path "${env:GITHUB_PATH}" -Value ".dotnet-${env:UET_FRAMEWORK_TARGET}/dotnet" + - name: Download AutoDiscovery + uses: actions/download-artifact@v4 + with: + name: autodiscovery-nupkg + path: UET/Redpoint.AutoDiscovery/bin/Release/ + merge-multiple: true + - name: Download Mac Logging + uses: actions/download-artifact@v4 + with: + name: mac-logging-nupkg + path: UET/ + merge-multiple: true + - name: Build and Test Libraries on macOS + run: | + set -e + echo "Package version: $UET_PACKAGE_VERSION" + dotnet build -c Release /p:PackageVersion=$UET_PACKAGE_VERSION UET/UET.sln + for TEST_PATH in $(find UET -type d -name "*.Tests"); do + TEST_NAME=${TEST_PATH:4} + if [ -e "$TEST_PATH/$TEST_NAME.csproj" ]; then + echo "============ STARTING: $TEST_NAME ============" + dotnet test --logger:"console" --logger:"trx;LogFilePath=$(pwd)/TestResults/$TEST_NAME.test-result.trx" "$TEST_PATH/bin/Release/net8.0/$TEST_NAME.dll" + echo "============ PASSED: $TEST_NAME ============" + fi + done + - name: Report Test Results + uses: dorny/test-reporter@v1 + if: success() || failure() + with: + name: macOS Test Results + path: TestResults/*.test-result.trx + reporter: dotnet-trx \ No newline at end of file diff --git a/Build/.platform-autodiscovery.gitlab-ci.yml b/Build/.platform-autodiscovery.gitlab-ci.yml deleted file mode 100644 index d0ccb821..00000000 --- a/Build/.platform-autodiscovery.gitlab-ci.yml +++ /dev/null @@ -1,66 +0,0 @@ -"Build AutoDiscovery Win Debug x64": - stage: "Platform Specific" - extends: .shared-windows-net - needs: - - Timestamp - interruptible: true - script: | - $PackageVersion = (Get-Content -Raw -Path "package.version").Trim() - & "$env:UET_DOTNET_WIN_PATH" msbuild -restore -p:RuntimeIdentifier=win-x64 -p:Configuration=Debug -p:Platform=x64 -p:BaseUetVersion=$PackageVersion -p:PackageVersion=$PackageVersion UET/Redpoint.AutoDiscovery.Win64/Redpoint.AutoDiscovery.Win64.csproj - artifacts: - paths: - - "UET/Redpoint.AutoDiscovery.Win64/bin/x64/Debug/$FRAMEWORK_TARGET/" - -"Build AutoDiscovery Win Debug x86": - stage: "Platform Specific" - extends: .shared-windows-net - needs: - - Timestamp - interruptible: true - script: | - $PackageVersion = (Get-Content -Raw -Path "package.version").Trim() - & "$env:UET_DOTNET_WIN_PATH" msbuild -restore -p:RuntimeIdentifier=win-x86 -p:Configuration=Debug -p:Platform=x86 -p:BaseUetVersion=$PackageVersion -p:PackageVersion=$PackageVersion UET/Redpoint.AutoDiscovery.Win32/Redpoint.AutoDiscovery.Win32.csproj - artifacts: - paths: - - "UET/Redpoint.AutoDiscovery.Win32/bin/x86/Debug/$FRAMEWORK_TARGET/" - -"Build AutoDiscovery Win Release x64": - stage: "Platform Specific" - extends: .shared-windows-net - needs: - - Timestamp - interruptible: true - script: | - $PackageVersion = (Get-Content -Raw -Path "package.version").Trim() - & "$env:UET_DOTNET_WIN_PATH" msbuild -restore -p:RuntimeIdentifier=win-x64 -p:Configuration=Release -p:Platform=x64 -p:BaseUetVersion=$PackageVersion -p:PackageVersion=$PackageVersion UET/Redpoint.AutoDiscovery.Win64/Redpoint.AutoDiscovery.Win64.csproj - artifacts: - paths: - - "UET/Redpoint.AutoDiscovery.Win64/bin/x64/Release/$FRAMEWORK_TARGET/" - -"Build AutoDiscovery Win Release x86": - stage: "Platform Specific" - extends: .shared-windows-net - needs: - - Timestamp - interruptible: true - script: | - $PackageVersion = (Get-Content -Raw -Path "package.version").Trim() - & "$env:UET_DOTNET_WIN_PATH" msbuild -restore -p:RuntimeIdentifier=win-x86 -p:Configuration=Release -p:Platform=x86 -p:BaseUetVersion=$PackageVersion -p:PackageVersion=$PackageVersion UET/Redpoint.AutoDiscovery.Win32/Redpoint.AutoDiscovery.Win32.csproj - artifacts: - paths: - - "UET/Redpoint.AutoDiscovery.Win32/bin/x86/Release/$FRAMEWORK_TARGET/" - -"Build AutoDiscovery": - stage: "Platform Specific" - extends: .shared-windows-net - needs: - - Timestamp - - "Build AutoDiscovery Win Release x64" - - "Build AutoDiscovery Win Release x86" - interruptible: true - script: | - $PackageVersion = (Get-Content -Raw -Path "package.version").Trim() - & "$env:UET_DOTNET_WIN_PATH" msbuild -restore -t:Publish -p:Configuration=Release -p:Platform=AnyCPU -p:UsePrebuiltLibsForAutoDiscovery=true -p:BaseUetVersion=$PackageVersion -p:PackageVersion=$PackageVersion UET/Redpoint.AutoDiscovery/Redpoint.AutoDiscovery.csproj - artifacts: - paths: - - "UET/Redpoint.AutoDiscovery/bin/Release/Redpoint.AutoDiscovery.*.nupkg" \ No newline at end of file diff --git a/Build/.platform-maclogging.gitlab-ci.yml b/Build/.platform-maclogging.gitlab-ci.yml deleted file mode 100644 index 1a7a03ef..00000000 --- a/Build/.platform-maclogging.gitlab-ci.yml +++ /dev/null @@ -1,16 +0,0 @@ -"Build Mac Logging": - stage: "Platform Specific" - extends: .shared-mac-net - needs: - - Timestamp - interruptible: true - script: | - PACKAGE_VERSION=$(cat package.version | tr -d '\n') - echo "Package version: $PACKAGE_VERSION" - $UET_DOTNET_MAC_PATH msbuild -t:BuildNativeMacLibraries -p:Configuration=Release -p:BaseUetVersion=$PACKAGE_VERSION -p:PackageVersion=$PACKAGE_VERSION UET/Redpoint.Logging.Mac/Redpoint.Logging.Mac.csproj - $UET_DOTNET_MAC_PATH msbuild -t:BuildAndReferenceNupkg -p:Configuration=Release -p:BaseUetVersion=$PACKAGE_VERSION -p:PackageVersion=$PACKAGE_VERSION UET/Redpoint.Logging.Mac/Redpoint.Logging.Mac.csproj - artifacts: - paths: - - "UET/Redpoint.Logging.Mac.Native/runtimes/osx-arm64/libLogging.arm64.dylib" - - "UET/Redpoint.Logging.Mac.Native/runtimes/osx-x64/libLogging.x64.dylib" - - "UET/Redpoint.Logging.Mac/bin/Redpoint.Logging.Mac.Native.*.nupkg" \ No newline at end of file diff --git a/Build/.stringenum.gitlab-ci.yml b/Build/.stringenum.gitlab-ci.yml deleted file mode 100644 index 29275906..00000000 --- a/Build/.stringenum.gitlab-ci.yml +++ /dev/null @@ -1,20 +0,0 @@ -"Test StringEnum Trimmed": - stage: Build Libraries - needs: [] - interruptible: true - image: - name: mcr.microsoft.com/dotnet/sdk:8.0 - tags: - - redpoint-games-docker-pwsh - script: | - apt-get update && apt-get install -y clang zlib1g-dev - dotnet publish /p:TargetFramework=net8.0 -c Release -r linux-x64 UET/Redpoint.StringEnum.TrimTests/Redpoint.StringEnum.TrimTests.csproj - if ($LastExitCode -ne 0) { - Write-Host "dotnet build (Redpoint.StringEnum.TrimTests.csproj) failed with exit code $LastExitCode" - exit $LastExitCode - } - UET/Redpoint.StringEnum.TrimTests/bin/Release/net8.0/linux-x64/publish/Redpoint.StringEnum.TrimTests - if ($LastExitCode -ne 0) { - Write-Host "Redpoint.StringEnum.TrimTests failed with exit code $LastExitCode" - exit $LastExitCode - } \ No newline at end of file diff --git a/Build/.uefs-client.gitlab-ci.yml b/Build/.uefs-client.gitlab-ci.yml deleted file mode 100644 index e024ff20..00000000 --- a/Build/.uefs-client.gitlab-ci.yml +++ /dev/null @@ -1,36 +0,0 @@ -"Build Win UEFS Client": - stage: Build Pass 1 - extends: .shared-windows-net - needs: - - Timestamp - - "Build Mac Logging" - - "Build AutoDiscovery" - interruptible: true - script: | - $PackageVersion = (Get-Content -Raw -Path "package.version").Trim() - & "$env:UET_DOTNET_WIN_PATH" msbuild -restore -t:Publish -p:RuntimeIdentifier=win-x64 -p:Configuration=Release -p:BaseUetVersion=$PackageVersion -p:PackageVersion=$PackageVersion UET/Redpoint.Uefs.Client/Redpoint.Uefs.Client.csproj - if ($LastExitCode -ne 0) { - Write-Host "Publish win-x64 (Redpoint.Uefs.Client.csproj) failed with exit code $LastExitCode" - exit $LastExitCode - } - artifacts: - paths: - - "UET/Redpoint.Uefs.Client/bin/Release/net8.0/win-x64/publish/uefs.exe" - -"Build Mac UEFS Client": - stage: Build Pass 1 - extends: .shared-mac-net - needs: - - Timestamp - - "Build Mac Logging" - - "Build AutoDiscovery" - interruptible: true - script: | - PACKAGE_VERSION=$(cat package.version | tr -d '\n') - echo "Package version: $PACKAGE_VERSION" - $UET_DOTNET_MAC_PATH msbuild -restore -t:Publish -p:RuntimeIdentifier=osx-arm64 -p:Configuration=Release -p:BaseUetVersion=$PACKAGE_VERSION -p:PackageVersion=$PACKAGE_VERSION UET/Redpoint.Uefs.Client/Redpoint.Uefs.Client.csproj - # Ensure the thing we built will actually run... - ./UET/Redpoint.Uefs.Client/bin/Release/net8.0/osx-arm64/publish/uefs --help - artifacts: - paths: - - "UET/Redpoint.Uefs.Client/bin/Release/net8.0/osx-arm64/publish/uefs" diff --git a/Build/.uefs-daemon.gitlab-ci.yml b/Build/.uefs-daemon.gitlab-ci.yml deleted file mode 100644 index 9901a4d1..00000000 --- a/Build/.uefs-daemon.gitlab-ci.yml +++ /dev/null @@ -1,34 +0,0 @@ -"Build Win UEFS Daemon": - stage: Build Pass 1 - extends: .shared-windows-net - needs: - - Timestamp - - "Build Mac Logging" - - "Build AutoDiscovery" - interruptible: true - script: | - $PackageVersion = (Get-Content -Raw -Path "package.version").Trim() - & "$env:UET_DOTNET_WIN_PATH" msbuild -restore -t:Publish -p:RuntimeIdentifier=win-x64 -p:Configuration=Release -p:BaseUetVersion=$PackageVersion -p:PackageVersion=$PackageVersion UET/Redpoint.Uefs.Daemon/Redpoint.Uefs.Daemon.csproj - if ($LastExitCode -ne 0) { - Write-Host "Publish win-x64 (Redpoint.Uefs.Daemon.csproj) failed with exit code $LastExitCode" - exit $LastExitCode - } - artifacts: - paths: - - "UET/Redpoint.Uefs.Daemon/bin/Release/net8.0/win-x64/publish/uefs-daemon.exe" - -"Build Mac UEFS Daemon": - stage: Build Pass 1 - extends: .shared-mac-net - needs: - - Timestamp - - "Build Mac Logging" - - "Build AutoDiscovery" - interruptible: true - script: | - PACKAGE_VERSION=$(cat package.version | tr -d '\n') - echo "Package version: $PACKAGE_VERSION" - $UET_DOTNET_MAC_PATH msbuild -restore -t:Publish -p:RuntimeIdentifier=osx-arm64 -p:Configuration=Release -p:BaseUetVersion=$PACKAGE_VERSION -p:PackageVersion=$PACKAGE_VERSION UET/Redpoint.Uefs.Daemon/Redpoint.Uefs.Daemon.csproj - artifacts: - paths: - - "UET/Redpoint.Uefs.Daemon/bin/Release/net8.0/osx-arm64/publish/uefs-daemon" \ No newline at end of file diff --git a/Build/.uet-lib.gitlab-ci.yml b/Build/.uet-lib.gitlab-ci.yml deleted file mode 100644 index a68eb02f..00000000 --- a/Build/.uet-lib.gitlab-ci.yml +++ /dev/null @@ -1,64 +0,0 @@ -"Build and Test Libraries on Windows": - stage: Build Libraries - extends: .shared-windows-net - needs: - - Timestamp - - "Build Mac Logging" - - "Build AutoDiscovery Win Release x86" - - "Build AutoDiscovery Win Release x64" - - "Build AutoDiscovery Win Debug x86" - - "Build AutoDiscovery Win Debug x64" - - "Build AutoDiscovery" - interruptible: true - script: | - $PackageVersion = (Get-Content -Raw -Path "package.version").Trim() - dotnet build -c Release /p:PackageVersion=$PackageVersion UET/UET.sln - if ($LastExitCode -ne 0) { - Write-Host "dotnet build (UET.sln) failed with exit code $LastExitCode" - exit $LastExitCode - } - foreach ($Item in (Get-ChildItem UET -Filter *.Tests)) { - if (Test-Path "$($Item.FullName)/$($Item.Name).csproj") { - Write-Host "============ STARTING: $($Item.Name) ============" - dotnet test --logger:"console" --logger:"junit;LogFilePath=$((Get-Location).Path)\TestResults\$($Item.Name).test-result.xml" "$($Item.FullName)/bin/Release/net8.0/$($Item.Name).dll" - if ($LastExitCode -ne 0) { - Write-Host "============ FAILED: $($Item.Name) ============" - exit $LastExitCode - } - Write-Host "============ PASSED: $($Item.Name) ============" - } - } - artifacts: - reports: - junit: TestResults/*.test-result.xml - paths: - - "**/*.nupkg" - -"Build and Test Libraries on macOS": - stage: Build Libraries - extends: .shared-mac-net - needs: - - Timestamp - - "Build Mac Logging" - - "Build AutoDiscovery Win Release x86" - - "Build AutoDiscovery Win Release x64" - - "Build AutoDiscovery Win Debug x86" - - "Build AutoDiscovery Win Debug x64" - - "Build AutoDiscovery" - interruptible: true - script: | - set -e - PACKAGE_VERSION=$(cat package.version | tr -d '\n') - echo "Package version: $PACKAGE_VERSION" - dotnet build -c Release /p:PackageVersion=$PACKAGE_VERSION UET/UET.sln - for TEST_PATH in $(find UET -type d -name "*.Tests"); do - TEST_NAME=${TEST_PATH:4} - if [ -e "$TEST_PATH/$TEST_NAME.csproj" ]; then - echo "============ STARTING: $TEST_NAME ============" - dotnet test --logger:"console" --logger:"junit;LogFilePath=$(pwd)/TestResults/$TEST_NAME.test-result.xml" "$TEST_PATH/bin/Release/net8.0/$TEST_NAME.dll" - echo "============ PASSED: $TEST_NAME ============" - fi - done - artifacts: - reports: - junit: TestResults/*.test-result.xml \ No newline at end of file diff --git a/Build/.uet-pass-1.gitlab-ci.yml b/Build/.uet-pass-1.gitlab-ci.yml deleted file mode 100644 index 559d38ec..00000000 --- a/Build/.uet-pass-1.gitlab-ci.yml +++ /dev/null @@ -1,36 +0,0 @@ -"Build Win UET Pass 1": - stage: Build Pass 1 - extends: .shared-windows-net - needs: - - Timestamp - - "Build Mac Logging" - - "Build AutoDiscovery" - interruptible: true - script: | - $PackageVersion = (Get-Content -Raw -Path "package.version").Trim() - & "$env:UET_DOTNET_WIN_PATH" msbuild -restore -t:Publish -p:RuntimeIdentifier=win-x64 -p:Configuration=Release -p:BaseUetVersion=$PackageVersion -p:PackageVersion=$PackageVersion UET/uet/uet.csproj - if ($LastExitCode -ne 0) { - Write-Host "Publish win-x64 (uet.csproj) failed with exit code $LastExitCode" - exit $LastExitCode - } - artifacts: - paths: - - "UET/uet/bin/Release/net8.0/win-x64/publish/uet.exe" - -"Build Mac UET Pass 1": - stage: Build Pass 1 - extends: .shared-mac-net - needs: - - Timestamp - - "Build Mac Logging" - - "Build AutoDiscovery" - interruptible: true - script: | - PACKAGE_VERSION=$(cat package.version | tr -d '\n') - echo "Package version: $PACKAGE_VERSION" - $UET_DOTNET_MAC_PATH msbuild -restore -t:Publish -p:RuntimeIdentifier=osx-arm64 -p:Configuration=Release -p:BaseUetVersion=$PACKAGE_VERSION -p:PackageVersion=$PACKAGE_VERSION UET/uet/uet.csproj - # Ensure the thing we built will actually run... - ./UET/uet/bin/Release/net8.0/osx-arm64/publish/uet --help - artifacts: - paths: - - "UET/uet/bin/Release/net8.0/osx-arm64/publish/uet" \ No newline at end of file diff --git a/Build/.uet-shim.gitlab-ci.yml b/Build/.uet-shim.gitlab-ci.yml deleted file mode 100644 index 3fd053b9..00000000 --- a/Build/.uet-shim.gitlab-ci.yml +++ /dev/null @@ -1,30 +0,0 @@ -"Build Win UET Shim": - stage: Build Pass 1 - extends: .shared-windows-net - needs: - - Timestamp - interruptible: true - script: | - $PackageVersion = (Get-Content -Raw -Path "package.version").Trim() - & "$env:UET_DOTNET_WIN_PATH" msbuild -restore -t:Publish -p:RuntimeIdentifier=win-x64 -p:Configuration=Release -p:BaseUetVersion=$PackageVersion -p:PackageVersion=$PackageVersion UET/uet.shim/uet.shim.csproj - if ($LastExitCode -ne 0) { - Write-Host "Publish win-x64 (uet.csproj) failed with exit code $LastExitCode" - exit $LastExitCode - } - artifacts: - paths: - - "UET/uet.shim/bin/Release/net8.0/win-x64/publish/uet.exe" - -"Build Mac UET Shim": - stage: Build Pass 1 - extends: .shared-mac-net - needs: - - Timestamp - interruptible: true - script: | - PACKAGE_VERSION=$(cat package.version | tr -d '\n') - echo "Package version: $PACKAGE_VERSION" - $UET_DOTNET_MAC_PATH msbuild -restore -t:Publish -p:RuntimeIdentifier=osx-arm64 -p:Configuration=Release -p:BaseUetVersion=$PACKAGE_VERSION -p:PackageVersion=$PACKAGE_VERSION UET/uet.shim/uet.shim.csproj - artifacts: - paths: - - "UET/uet.shim/bin/Release/net8.0/osx-arm64/publish/uet" \ No newline at end of file