diff --git a/.github/workflows/concurrency-tests.yml b/.github/workflows/concurrency-tests.yml index 43c438ef2d9..4ff616911ce 100644 --- a/.github/workflows/concurrency-tests.yml +++ b/.github/workflows/concurrency-tests.yml @@ -24,7 +24,7 @@ jobs: - name: Run Coyote Tests shell: pwsh - run: .\build\test-threadSafety.ps1 -testProjectName ${{ matrix.project }} -targetFramework ${{ matrix.version }} + run: .\build\scripts\test-threadSafety.ps1 -testProjectName ${{ matrix.project }} -targetFramework ${{ matrix.version }} - name: Publish Artifacts if: always() && !cancelled() diff --git a/.github/workflows/sanitycheck.yml b/.github/workflows/sanitycheck.yml index 1c01e5a8235..d98f3fea2c9 100644 --- a/.github/workflows/sanitycheck.yml +++ b/.github/workflows/sanitycheck.yml @@ -29,4 +29,4 @@ jobs: uses: actions/checkout@v4 - name: detect non-ASCII encoding and trailing space - run: python3 ./build/sanitycheck.py + run: python3 ./build/scripts/sanitycheck.py diff --git a/.github/workflows/verifyaotcompat.yml b/.github/workflows/verifyaotcompat.yml index e9beff96d64..24991b9fe3c 100644 --- a/.github/workflows/verifyaotcompat.yml +++ b/.github/workflows/verifyaotcompat.yml @@ -23,4 +23,4 @@ jobs: - name: publish AOT testApp, assert static analysis warning count, and run the app shell: pwsh - run: .\build\test-aot-compatibility.ps1 ${{ matrix.version }} + run: .\build\scripts\test-aot-compatibility.ps1 ${{ matrix.version }} diff --git a/OpenTelemetry.sln b/OpenTelemetry.sln index 068ac93c65a..0cb759d078e 100644 --- a/OpenTelemetry.sln +++ b/OpenTelemetry.sln @@ -40,10 +40,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7CB2F02E build\OpenTelemetry.prod.ruleset = build\OpenTelemetry.prod.ruleset build\OpenTelemetry.test.ruleset = build\OpenTelemetry.test.ruleset build\RELEASING.md = build\RELEASING.md - build\sanitycheck.py = build\sanitycheck.py build\stylecop.json = build\stylecop.json - build\test-aot-compatibility.ps1 = build\test-aot-compatibility.ps1 - build\test-threadSafety.ps1 = build\test-threadSafety.ps1 build\UnstableCoreLibraries.proj = build\UnstableCoreLibraries.proj build\xunit.runner.json = build\xunit.runner.json EndProjectSection @@ -340,6 +337,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{4498 build\scripts\finalize-publicapi.ps1 = build\scripts\finalize-publicapi.ps1 build\scripts\post-release.psm1 = build\scripts\post-release.psm1 build\scripts\prepare-release.psm1 = build\scripts\prepare-release.psm1 + build\scripts\sanitycheck.py = build\scripts\sanitycheck.py + build\scripts\test-aot-compatibility.ps1 = build\scripts\test-aot-compatibility.ps1 + build\scripts\test-threadSafety.ps1 = build\scripts\test-threadSafety.ps1 build\scripts\update-changelogs.ps1 = build\scripts\update-changelogs.ps1 EndProjectSection EndProject diff --git a/build/sanitycheck.py b/build/scripts/sanitycheck.py similarity index 100% rename from build/sanitycheck.py rename to build/scripts/sanitycheck.py diff --git a/build/test-aot-compatibility.ps1 b/build/scripts/test-aot-compatibility.ps1 similarity index 96% rename from build/test-aot-compatibility.ps1 rename to build/scripts/test-aot-compatibility.ps1 index 39d36520346..c7fc3acf7d8 100644 --- a/build/test-aot-compatibility.ps1 +++ b/build/scripts/test-aot-compatibility.ps1 @@ -1,6 +1,7 @@ param([string]$targetNetFramework) -$rootDirectory = Split-Path $PSScriptRoot -Parent +$rootDirectory = Get-Location + $publishOutput = dotnet publish $rootDirectory/test/OpenTelemetry.AotCompatibility.TestApp/OpenTelemetry.AotCompatibility.TestApp.csproj --framework $targetNetFramework -nodeReuse:false /p:UseSharedCompilation=false /p:ExposeExperimentalFeatures=true $actualWarningCount = 0 diff --git a/build/test-threadSafety.ps1 b/build/scripts/test-threadSafety.ps1 similarity index 96% rename from build/test-threadSafety.ps1 rename to build/scripts/test-threadSafety.ps1 index 6694870b6b4..73cc1f27d27 100644 --- a/build/test-threadSafety.ps1 +++ b/build/scripts/test-threadSafety.ps1 @@ -8,7 +8,7 @@ param( $env:OTEL_RUN_COYOTE_TESTS = 'true' -$rootDirectory = Split-Path $PSScriptRoot -Parent +$rootDirectory = Get-Location Write-Host "Install Coyote CLI." dotnet tool install --global Microsoft.Coyote.CLI