Skip to content

Commit 1b0faef

Browse files
authored
Merge pull request #1285 from michaeltlombardi/maint/main/rename-build-scripts
(MAINT) Rename build scripts
2 parents 4886bd0 + 195d645 commit 1b0faef

File tree

11 files changed

+1413
-1742
lines changed

11 files changed

+1413
-1742
lines changed

.github/instructions/instructions.md

Lines changed: 78 additions & 66 deletions
Large diffs are not rendered by default.

.github/workflows/rust.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
steps:
2828
- uses: actions/checkout@v5
2929
- name: Install prerequisites
30-
run: ./build.new.ps1 -SkipBuild -Clippy -Verbose
30+
run: ./build.ps1 -SkipBuild -Clippy -Verbose
3131
- name: Generate documentation
32-
run: ./build.new.ps1 -RustDocs -Verbose
32+
run: ./build.ps1 -RustDocs -Verbose
3333
- name: Test documentation
3434
run: |-
3535
$testParams = @{
@@ -40,17 +40,17 @@ jobs:
4040
ExcludePesterTests = $true
4141
Verbose = $true
4242
}
43-
./build.new.ps1 @testParams
43+
./build.ps1 @testParams
4444
linux-build:
4545
runs-on: ubuntu-latest
4646
steps:
4747
- uses: actions/checkout@v5
4848
- name: Install prerequisites
49-
run: ./build.new.ps1 -SkipBuild -Clippy -Verbose
49+
run: ./build.ps1 -SkipBuild -Clippy -Verbose
5050
- name: Build
51-
run: ./build.new.ps1 -Clippy -Verbose
51+
run: ./build.ps1 -Clippy -Verbose
5252
- name: Run rust tests
53-
run: ./build.new.ps1 -SkipBuild -Test -ExcludePesterTests -Verbose
53+
run: ./build.ps1 -SkipBuild -Test -ExcludePesterTests -Verbose
5454
- name: Prepare build artifact
5555
run: tar -cvf bin.tar bin/
5656
- name: Upload build artifact
@@ -81,18 +81,18 @@ jobs:
8181
ExcludeRustTests = $true
8282
Verbose = $true
8383
}
84-
./build.new.ps1 @params -PesterTestGroup ${{matrix.group}}
84+
./build.ps1 @params -PesterTestGroup ${{matrix.group}}
8585
8686
macos-build:
8787
runs-on: macos-latest
8888
steps:
8989
- uses: actions/checkout@v5
9090
- name: Install prerequisites
91-
run: ./build.new.ps1 -SkipBuild -Clippy -Verbose
91+
run: ./build.ps1 -SkipBuild -Clippy -Verbose
9292
- name: Build
93-
run: ./build.new.ps1 -Clippy -Verbose
93+
run: ./build.ps1 -Clippy -Verbose
9494
- name: Run rust tests
95-
run: ./build.new.ps1 -SkipBuild -Test -ExcludePesterTests -Verbose
95+
run: ./build.ps1 -SkipBuild -Test -ExcludePesterTests -Verbose
9696
- name: Prepare build artifact
9797
run: tar -cvf bin.tar bin/
9898
- name: Upload build artifact
@@ -123,19 +123,19 @@ jobs:
123123
ExcludeRustTests = $true
124124
Verbose = $true
125125
}
126-
./build.new.ps1 @params -PesterTestGroup ${{matrix.group}}
126+
./build.ps1 @params -PesterTestGroup ${{matrix.group}}
127127
128128
# Windows
129129
windows-build:
130130
runs-on: windows-latest
131131
steps:
132132
- uses: actions/checkout@v5
133133
- name: Install prerequisites
134-
run: ./build.new.ps1 -SkipBuild -Clippy -Verbose
134+
run: ./build.ps1 -SkipBuild -Clippy -Verbose
135135
- name: Build
136-
run: ./build.new.ps1 -Clippy -Verbose
136+
run: ./build.ps1 -Clippy -Verbose
137137
- name: Run rust tests
138-
run: ./build.new.ps1 -SkipBuild -Test -ExcludePesterTests -Verbose
138+
run: ./build.ps1 -SkipBuild -Test -ExcludePesterTests -Verbose
139139
- name: List bin folder files
140140
run: Get-ChildItem bin
141141
- name: Prepare build artifact
@@ -168,4 +168,4 @@ jobs:
168168
ExcludeRustTests = $true
169169
Verbose = $true
170170
}
171-
./build.new.ps1 @params -PesterTestGroup ${{matrix.group}}
171+
./build.ps1 @params -PesterTestGroup ${{matrix.group}}

.pipelines/DSC-Official.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ extends:
9191
- checkout: self
9292
- pwsh: |
9393
Write-Verbose -Verbose (Get-ChildItem '$(repoRoot)' | Out-String)
94-
$packageVersion = $(repoRoot)/build.ps1 -GetPackageVersion
94+
$packageVersion = $(repoRoot)/packaging.ps1 -GetPackageVersion
9595
$vstsCommandString = "vso[task.setvariable variable=Version;isoutput=true]$packageVersion"
9696
Write-Host ("sending " + $vstsCommandString)
9797
Write-Host "##$vstsCommandString"
@@ -181,7 +181,7 @@ extends:
181181
$null = New-Item -ItemType Directory -Path "./bin/msix" -Force -ErrorAction Ignore
182182
Copy-Item "$(Pipeline.Workspace)/drop_BuildAndSign_BuildWin_x64/*.msix" ./bin/msix -Verbose
183183
Copy-Item "$(Pipeline.Workspace)/drop_BuildAndSign_BuildWin_arm64/*.msix" ./bin/msix -Verbose
184-
./build.ps1 -PackageType msixbundle
184+
./packaging.ps1 -PackageType msixbundle
185185
Copy-Item "$(System.DefaultWorkingDirectory)/DSC/bin/*.msixbundle" "$(ob_outputDirectory)"
186186
displayName: 'Create msixbundle'
187187
condition: succeeded()
@@ -323,10 +323,10 @@ extends:
323323
$header = "Bearer $(AzToken)"
324324
$env:CARGO_REGISTRIES_POWERSHELL_TOKEN = $header
325325
$env:CARGO_REGISTRIES_POWERSHELL_CREDENTIAL_PROVIDER = 'cargo:token'
326-
./build.ps1 -Release -Architecture x86_64-unknown-linux-musl
327-
./build.ps1 -PackageType tgz -Architecture x86_64-unknown-linux-musl -Release
328-
./build.ps1 -PackageType rpm -Architecture x86_64-unknown-linux-musl -Release
329-
./build.ps1 -PackageType deb -Architecture x86_64-unknown-linux-musl -Release
326+
./packaging.ps1 -Release -Architecture x86_64-unknown-linux-musl
327+
./packaging.ps1 -PackageType tgz -Architecture x86_64-unknown-linux-musl -Release
328+
./packaging.ps1 -PackageType rpm -Architecture x86_64-unknown-linux-musl -Release
329+
./packaging.ps1 -PackageType deb -Architecture x86_64-unknown-linux-musl -Release
330330
Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"
331331
Copy-Item ./bin/*.rpm "$(ob_outputDirectory)"
332332
Copy-Item ./bin/*.deb "$(ob_outputDirectory)"
@@ -386,10 +386,10 @@ extends:
386386
$header = "Bearer $(AzToken)"
387387
$env:CARGO_REGISTRIES_POWERSHELL_TOKEN = $header
388388
$env:CARGO_REGISTRIES_POWERSHELL_CREDENTIAL_PROVIDER = 'cargo:token'
389-
./build.ps1 -Release -Architecture aarch64-unknown-linux-musl
390-
./build.ps1 -PackageType tgz -Architecture aarch64-unknown-linux-musl -Release
391-
./build.ps1 -PackageType rpm -Architecture aarch64-unknown-linux-musl -Release
392-
./build.ps1 -PackageType deb -Architecture aarch64-unknown-linux-musl -Release
389+
./packaging.ps1 -Release -Architecture aarch64-unknown-linux-musl
390+
./packaging.ps1 -PackageType tgz -Architecture aarch64-unknown-linux-musl -Release
391+
./packaging.ps1 -PackageType rpm -Architecture aarch64-unknown-linux-musl -Release
392+
./packaging.ps1 -PackageType deb -Architecture aarch64-unknown-linux-musl -Release
393393
Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"
394394
Copy-Item ./bin/*.rpm "$(ob_outputDirectory)"
395395
Copy-Item ./bin/*.deb "$(ob_outputDirectory)"
@@ -436,8 +436,8 @@ extends:
436436
$env:CARGO_REGISTRIES_POWERSHELL_TOKEN = $header
437437
$env:CARGO_REGISTRIES_POWERSHELL_CREDENTIAL_PROVIDER = 'cargo:token'
438438
Write-Verbose -Verbose "Building for $(buildName)"
439-
./build.ps1 -Release -Architecture $(buildName)
440-
./build.ps1 -PackageType tgz -Architecture $(buildName) -Release
439+
./packaging.ps1 -Release -Architecture $(buildName)
440+
./packaging.ps1 -PackageType tgz -Architecture $(buildName) -Release
441441
Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"
442442
Write-Host "##vso[artifact.upload containerfolder=release;artifactname=release]$(ob_outputDirectory)/DSC-$(PackageVersion)-$(buildName).tar.gz"
443443
displayName: 'Build $(buildName)'

.pipelines/DSC-Windows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ steps:
5050
$env:PATH += ";$LLVMBIN"
5151
write-verbose -verbose (gcm clang.exe | out-string)
5252
Write-Verbose -Verbose "Building for ${{ parameters.buildName }}"
53-
./build.ps1 -Release -Architecture ${{ parameters.buildName }} -SkipLinkCheck
53+
./packaging.ps1 -Release -Architecture ${{ parameters.buildName }} -SkipLinkCheck
5454
displayName: 'Build ${{ parameters.buildName }}'
5555
env:
5656
ob_restore_phase: true
@@ -95,13 +95,13 @@ steps:
9595
OverWrite: true
9696
- pwsh: |
9797
Set-Location "$(Build.SourcesDirectory)/DSC"
98-
./build.ps1 -PackageType zip -Architecture ${{ parameters.buildName }} -Release
98+
./packaging.ps1 -PackageType zip -Architecture ${{ parameters.buildName }} -Release
9999
Copy-Item ./bin/*.zip "$(Build.ArtifactStagingDirectory)" -Verbose
100100
displayName: 'Zip ${{ parameters.buildName }}'
101101
condition: succeeded()
102102
- pwsh: |
103103
Set-Location "$(Build.SourcesDirectory)/DSC"
104-
./build.ps1 -PackageType msix -Architecture ${{ parameters.buildName }} -Release -UseX64MakeAppx
104+
./packaging.ps1 -PackageType msix -Architecture ${{ parameters.buildName }} -Release -UseX64MakeAppx
105105
Copy-Item ./bin/msix/*.msix "$(Build.ArtifactStagingDirectory)" -Verbose
106106
displayName: 'Create msix for ${{ parameters.buildName }}'
107107
condition: succeeded()

.vscode/schemas/definitions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"$defs": {
44
"BuildDataFile": {
55
"title": "Build Data",
6-
"markdownDescription": "Defines metadata required for building, testing, and packaging DSC and all related projects with the `build.new.ps1` build script.",
6+
"markdownDescription": "Defines metadata required for building, testing, and packaging DSC and all related projects with the `build.ps1` build script.",
77
"type": "object",
88
"required": ["PackageFiles", "Projects"],
99
"unevaluatedProperties": false,

.vscode/tasks.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"label": "DSC: Build",
88
"detail": "Compiles the Rust crates and copies all build artifacts into the `bin` folder.",
99
"type": "shell",
10-
"command": "${workspaceFolder}/build.new.ps1",
10+
"command": "${workspaceFolder}/build.ps1",
1111
"args": [
1212
"-Clippy:${input:Clippy}",
1313
"-Verbose",
@@ -22,7 +22,7 @@
2222
"label": "DSC: Test (All)",
2323
"detail": "Tests every project with optional skipping of building the projects, Clippy linting, Rust tests, and Pester tests.",
2424
"type": "shell",
25-
"command": "${workspaceFolder}/build.new.ps1",
25+
"command": "${workspaceFolder}/build.ps1",
2626
"args": [
2727
"-SkipBuild:${input:SkipBuild}",
2828
"-Test",
@@ -40,7 +40,7 @@
4040
"label": "DSC: Test Rust",
4141
"detail": "Tests the Rust projects with optional skipping of building the projects and Clippy linting.",
4242
"type": "shell",
43-
"command": "${workspaceFolder}/build.new.ps1",
43+
"command": "${workspaceFolder}/build.ps1",
4444
"args": [
4545
"-SkipBuild:${input:SkipBuild}",
4646
"-Test",

CONTRIBUTING.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ For more information, see [Contributor License Agreements][01].
9090
Building the DSC project requires PowerShell 7.2 or later to execute the build script. For more
9191
information about installing PowerShell, see [Install PowerShell on Windows, Linux, and macOS][02].
9292

93-
DSC requires other tools for building the project. The build script (`build.new.ps1`) installs the
93+
DSC requires other tools for building the project. The build script (`build.ps1`) installs the
9494
tools in the following table if they aren't already installed on your system:
9595

9696
| Tool | Version | Platforms | Projects |
@@ -118,16 +118,16 @@ tools in the following table if they aren't already installed on your system:
118118

119119
```powershell
120120
# Build the project
121-
./build.new.ps1
121+
./build.ps1
122122
123123
# Build with linting (recommended)
124-
./build.new.ps1 -Clippy
124+
./build.ps1 -Clippy
125125
126126
# Build and run all tests
127-
./build.new.ps1 -Clippy -Test
127+
./build.ps1 -Clippy -Test
128128
129129
# Build in release mode (optimized)
130-
./build.new.ps1 -Release
130+
./build.ps1 -Release
131131
```
132132

133133
#### Running tests
@@ -136,16 +136,16 @@ DSCv3 includes Rust unit tests and PowerShell Pester tests:
136136

137137
```powershell
138138
# Run all tests
139-
./build.new.ps1 -Test
139+
./build.ps1 -Test
140140
141141
# Run only Rust tests
142-
./build.new.ps1 -Test -ExcludePesterTests
142+
./build.ps1 -Test -ExcludePesterTests
143143
144144
# Run only Pester tests
145-
./build.new.ps1 -Test -ExcludeRustTests
145+
./build.ps1 -Test -ExcludeRustTests
146146
147147
# Run specific Pester test groups
148-
./build.new.ps1 -SkipBuild -Test -ExcludeRustTests -PesterTestGroup dsc
148+
./build.ps1 -SkipBuild -Test -ExcludeRustTests -PesterTestGroup dsc
149149
```
150150

151151
Available Pester test groups include:
@@ -163,13 +163,13 @@ for other platforms and architectures with the `-Architecture` parameter:
163163

164164
```powershell
165165
# Windows ARM
166-
./build.new.ps1 -Architecture aarch64-pc-windows-msvc
166+
./build.ps1 -Architecture aarch64-pc-windows-msvc
167167
168168
# macOS Apple Silicon
169-
./build.new.ps1 -Architecture aarch64-apple-darwin
169+
./build.ps1 -Architecture aarch64-apple-darwin
170170
171171
# Linux x64
172-
./build.new.ps1 -Architecture x86_64-unknown-linux-gnu
172+
./build.ps1 -Architecture x86_64-unknown-linux-gnu
173173
```
174174

175175
#### Additional Information

0 commit comments

Comments
 (0)