Skip to content

Commit 3d6d3fa

Browse files
flcdrgflcdrg
committed
Switch to 'main' branch
1 parent 82792e7 commit 3d6d3fa

File tree

2 files changed

+79
-79
lines changed

2 files changed

+79
-79
lines changed

‎.github/workflows/main.yml

+77-77
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Build
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [main]
66
pull_request:
7-
branches: [ master ]
7+
branches: [main]
88

99
jobs:
1010
update_release_draft:
@@ -17,7 +17,7 @@ jobs:
1717
Release_body: ${{ steps.create_release.outputs.body}}
1818
Release_html_url: ${{ steps.create_release.outputs.html_url}}
1919
Release_upload_url: ${{ steps.create_release.outputs.upload_url}}
20-
20+
2121
permissions:
2222
contents: write
2323

@@ -40,7 +40,7 @@ jobs:
4040
setCommonVars: true
4141

4242
- uses: release-drafter/release-drafter@v6
43-
if: github.ref == 'refs/heads/master' # Running this action only for master branch
43+
if: github.ref == 'refs/heads/main' # Running this action only for main branch
4444
id: create_release
4545
env:
4646
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -61,76 +61,76 @@ jobs:
6161
Release_body: ${{ needs.update_release_draft.outputs.Release_body }}
6262

6363
steps:
64-
- name: Dump needs context
65-
env:
66-
NEEDS_CONTEXT: ${{ toJson(needs) }}
67-
run: echo "$NEEDS_CONTEXT"
68-
69-
- name: Checkout
70-
uses: actions/checkout@v4
71-
with:
72-
fetch-depth: 0
73-
74-
- name: Setup MSBuild.exe
75-
uses: microsoft/[email protected]
76-
77-
- name: NuGet Restore
78-
run: nuget restore
79-
80-
- name: Build
81-
run: msbuild PowerShellWixExtension.sln
82-
# NBGV is run as part of the build, so actions after here have access to NBGV_ env variables.
83-
84-
# For some reason, running msiexec from Pester doesn't work quite right.
85-
- name: msiexec
86-
run: |
87-
Start-Process msiexec.exe -Wait -ArgumentList "/i Tests\PowerShellWixInlineScriptTest\bin\Release\PowerShellWixInlineScriptTest.msi /q /liwearucmopvx ${{ github.workspace }}\inlinescript-install.log"
88-
Start-Process msiexec.exe -Wait -ArgumentList "/x Tests\PowerShellWixInlineScriptTest\bin\Release\PowerShellWixInlineScriptTest.msi /q /liwearucmopvx ${{ github.workspace }}\inlinescript-uninstall.log"
89-
Start-Process msiexec.exe -Wait -ArgumentList "/i Tests\PowerShellWixTest\bin\Release\PowerShellWixTest.msi /q /liwearucmopvx ${{ github.workspace }}\script-install.log"
90-
Start-Process msiexec.exe -Wait -ArgumentList "/x Tests\PowerShellWixTest\bin\Release\PowerShellWixTest.msi /q /liwearucmopvx ${{ github.workspace }}\script-uninstall.log"
91-
92-
- name: Pester
93-
id: test_module
94-
uses: zyborg/pester-tests-report@v1
95-
with:
96-
include_paths: tests
97-
github_token: ${{ secrets.GITHUB_TOKEN }}
98-
tests_fail_step: true
99-
100-
- uses: actions/upload-artifact@v4
101-
if: ${{ always() }}
102-
with:
103-
name: test logs
104-
path: ${{ github.workspace }}\**\*.log
105-
106-
- name: Pack
107-
run: nuget pack .\PowerShellWixExtension.nuspec -Version "$env:NBGV_NuGetPackageVersion" -Properties "Configuration=$env:Configuration;releasenotes=$env:Release_body"
108-
109-
- uses: actions/upload-artifact@v4
110-
with:
111-
name: nupkg
112-
path: ${{ github.workspace }}\PowerShellWixExtension.${{ env.NBGV_NuGetPackageVersion }}.nupkg
113-
114-
- name: Remove existing release asset
115-
uses: flcdrg/remove-release-asset-action@v4
116-
if: github.ref == 'refs/heads/master' # Running this action only for master branch
117-
with:
118-
# The release id to remove asset from
119-
release_id: ${{ needs.update_release_draft.outputs.Release_Id }}
120-
# The name of the asset you want to remove
121-
asset_name: PowerShellWixExtension.nupkg
122-
env:
123-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
124-
continue-on-error: true
125-
126-
- name: Upload Release Asset
127-
id: upload-release-asset
128-
uses: actions/upload-release-asset@v1
129-
if: github.ref == 'refs/heads/master' # Running this action only for master branch
130-
env:
131-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
132-
with:
133-
upload_url: ${{ needs.update_release_draft.outputs.Release_upload_url }}
134-
asset_path: ${{ github.workspace }}\PowerShellWixExtension.${{ env.NBGV_NuGetPackageVersion }}.nupkg
135-
asset_name: PowerShellWixExtension.nupkg
136-
asset_content_type: application/octet-stream
64+
- name: Dump needs context
65+
env:
66+
NEEDS_CONTEXT: ${{ toJson(needs) }}
67+
run: echo "$NEEDS_CONTEXT"
68+
69+
- name: Checkout
70+
uses: actions/checkout@v4
71+
with:
72+
fetch-depth: 0
73+
74+
- name: Setup MSBuild.exe
75+
uses: microsoft/[email protected]
76+
77+
- name: NuGet Restore
78+
run: nuget restore
79+
80+
- name: Build
81+
run: msbuild PowerShellWixExtension.sln
82+
# NBGV is run as part of the build, so actions after here have access to NBGV_ env variables.
83+
84+
# For some reason, running msiexec from Pester doesn't work quite right.
85+
- name: msiexec
86+
run: |
87+
Start-Process msiexec.exe -Wait -ArgumentList "/i Tests\PowerShellWixInlineScriptTest\bin\Release\PowerShellWixInlineScriptTest.msi /q /liwearucmopvx ${{ github.workspace }}\inlinescript-install.log"
88+
Start-Process msiexec.exe -Wait -ArgumentList "/x Tests\PowerShellWixInlineScriptTest\bin\Release\PowerShellWixInlineScriptTest.msi /q /liwearucmopvx ${{ github.workspace }}\inlinescript-uninstall.log"
89+
Start-Process msiexec.exe -Wait -ArgumentList "/i Tests\PowerShellWixTest\bin\Release\PowerShellWixTest.msi /q /liwearucmopvx ${{ github.workspace }}\script-install.log"
90+
Start-Process msiexec.exe -Wait -ArgumentList "/x Tests\PowerShellWixTest\bin\Release\PowerShellWixTest.msi /q /liwearucmopvx ${{ github.workspace }}\script-uninstall.log"
91+
92+
- name: Pester
93+
id: test_module
94+
uses: zyborg/pester-tests-report@v1
95+
with:
96+
include_paths: tests
97+
github_token: ${{ secrets.GITHUB_TOKEN }}
98+
tests_fail_step: true
99+
100+
- uses: actions/upload-artifact@v4
101+
if: ${{ always() }}
102+
with:
103+
name: test logs
104+
path: ${{ github.workspace }}\**\*.log
105+
106+
- name: Pack
107+
run: nuget pack .\PowerShellWixExtension.nuspec -Version "$env:NBGV_NuGetPackageVersion" -Properties "Configuration=$env:Configuration;releasenotes=$env:Release_body"
108+
109+
- uses: actions/upload-artifact@v4
110+
with:
111+
name: nupkg
112+
path: ${{ github.workspace }}\PowerShellWixExtension.${{ env.NBGV_NuGetPackageVersion }}.nupkg
113+
114+
- name: Remove existing release asset
115+
uses: flcdrg/remove-release-asset-action@v4
116+
if: github.ref == 'refs/heads/main' # Running this action only for main branch
117+
with:
118+
# The release id to remove asset from
119+
release_id: ${{ needs.update_release_draft.outputs.Release_Id }}
120+
# The name of the asset you want to remove
121+
asset_name: PowerShellWixExtension.nupkg
122+
env:
123+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
124+
continue-on-error: true
125+
126+
- name: Upload Release Asset
127+
id: upload-release-asset
128+
uses: actions/upload-release-asset@v1
129+
if: github.ref == 'refs/heads/main' # Running this action only for master branch
130+
env:
131+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
132+
with:
133+
upload_url: ${{ needs.update_release_draft.outputs.Release_upload_url }}
134+
asset_path: ${{ github.workspace }}\PowerShellWixExtension.${{ env.NBGV_NuGetPackageVersion }}.nupkg
135+
asset_name: PowerShellWixExtension.nupkg
136+
asset_content_type: application/octet-stream

‎version.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
2+
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
33
"version": "3.0",
44
"publicReleaseRefSpec": [
5-
"^refs/heads/master$",
5+
"^refs/heads/main$",
66
"^refs/heads/v\\d+(?:\\.\\d+)?$"
77
],
88
"nugetPackageVersion": {

0 commit comments

Comments
 (0)