Resolve Concelier/Excititor merge conflicts
This commit is contained in:
@@ -1,19 +1,19 @@
|
||||
#!/usr/bin/env pwsh
|
||||
Set-StrictMode -Version Latest
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$rootDir = Split-Path -Parent $PSCommandPath
|
||||
$rootDir = Join-Path $rootDir ".."
|
||||
$rootDir = Resolve-Path $rootDir
|
||||
|
||||
$env:UPDATE_APPLE_FIXTURES = "1"
|
||||
|
||||
Push-Location $rootDir
|
||||
try {
|
||||
$sentinel = Join-Path $rootDir "src/StellaOps.Feedser.Source.Vndr.Apple.Tests/Apple/Fixtures/.update-apple-fixtures"
|
||||
New-Item -ItemType File -Path $sentinel -Force | Out-Null
|
||||
dotnet test "src\StellaOps.Feedser.Source.Vndr.Apple.Tests\StellaOps.Feedser.Source.Vndr.Apple.Tests.csproj" @Args
|
||||
}
|
||||
finally {
|
||||
Pop-Location
|
||||
}
|
||||
#!/usr/bin/env pwsh
|
||||
Set-StrictMode -Version Latest
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
$rootDir = Split-Path -Parent $PSCommandPath
|
||||
$rootDir = Join-Path $rootDir ".."
|
||||
$rootDir = Resolve-Path $rootDir
|
||||
|
||||
$env:UPDATE_APPLE_FIXTURES = "1"
|
||||
|
||||
Push-Location $rootDir
|
||||
try {
|
||||
$sentinel = Join-Path $rootDir "src/StellaOps.Concelier.Connector.Vndr.Apple.Tests/Apple/Fixtures/.update-apple-fixtures"
|
||||
New-Item -ItemType File -Path $sentinel -Force | Out-Null
|
||||
dotnet test "src\StellaOps.Concelier.Connector.Vndr.Apple.Tests\StellaOps.Concelier.Connector.Vndr.Apple.Tests.csproj" @Args
|
||||
}
|
||||
finally {
|
||||
Pop-Location
|
||||
}
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
|
||||
export UPDATE_APPLE_FIXTURES=1
|
||||
if [ -n "${WSLENV-}" ]; then
|
||||
export WSLENV="${WSLENV}:UPDATE_APPLE_FIXTURES/up"
|
||||
else
|
||||
export WSLENV="UPDATE_APPLE_FIXTURES/up"
|
||||
fi
|
||||
|
||||
touch "$ROOT_DIR/src/StellaOps.Feedser.Source.Vndr.Apple.Tests/Apple/Fixtures/.update-apple-fixtures"
|
||||
( cd "$ROOT_DIR" && dotnet test "src/StellaOps.Feedser.Source.Vndr.Apple.Tests/StellaOps.Feedser.Source.Vndr.Apple.Tests.csproj" "$@" )
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
|
||||
export UPDATE_APPLE_FIXTURES=1
|
||||
if [ -n "${WSLENV-}" ]; then
|
||||
export WSLENV="${WSLENV}:UPDATE_APPLE_FIXTURES/up"
|
||||
else
|
||||
export WSLENV="UPDATE_APPLE_FIXTURES/up"
|
||||
fi
|
||||
|
||||
touch "$ROOT_DIR/src/StellaOps.Concelier.Connector.Vndr.Apple.Tests/Apple/Fixtures/.update-apple-fixtures"
|
||||
( cd "$ROOT_DIR" && dotnet test "src/StellaOps.Concelier.Connector.Vndr.Apple.Tests/StellaOps.Concelier.Connector.Vndr.Apple.Tests.csproj" "$@" )
|
||||
|
||||
@@ -6,4 +6,4 @@ Param(
|
||||
$Root = Split-Path -Parent $PSScriptRoot
|
||||
$env:UPDATE_GOLDENS = "1"
|
||||
|
||||
dotnet test (Join-Path $Root "src/StellaOps.Feedser.Models.Tests/StellaOps.Feedser.Models.Tests.csproj") @RestArgs
|
||||
dotnet test (Join-Path $Root "src/StellaOps.Concelier.Models.Tests/StellaOps.Concelier.Models.Tests.csproj") @RestArgs
|
||||
|
||||
@@ -5,4 +5,4 @@ ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
|
||||
export UPDATE_GOLDENS=1
|
||||
|
||||
dotnet test "$ROOT_DIR/src/StellaOps.Feedser.Models.Tests/StellaOps.Feedser.Models.Tests.csproj" "$@"
|
||||
dotnet test "$ROOT_DIR/src/StellaOps.Concelier.Models.Tests/StellaOps.Concelier.Models.Tests.csproj" "$@"
|
||||
|
||||
Reference in New Issue
Block a user