Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[repo] Build script organization #5619

Merged
merged 1 commit into from
May 14, 2024
Merged

[repo] Build script organization #5619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/concurrency-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sanitycheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/verifyaotcompat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
6 changes: 3 additions & 3 deletions OpenTelemetry.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
0 build/sanitycheck.py → build/scripts/sanitycheck.py
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion build/test-aot-compatibility.ps1 → build/scripts/test-aot-compatibility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/test-threadSafety.ps1 → build/scripts/test-threadSafety.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down