Skip to content

Commit 27c083a

Browse files
committed
GitHub actions: No need for setup-nuget
As per setup-nuget's documentation, setup-msbuild also takes care of making `nuget` available. Since we need the latter anyway, just move it earlier in the sequence of steps and remove a dependency (on setup-nuget).
1 parent 74bb276 commit 27c083a

File tree

2 files changed

+8
-20
lines changed

2 files changed

+8
-20
lines changed

.github/workflows/pull-request-checks.yaml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -675,9 +675,8 @@ jobs:
675675
- uses: actions/checkout@v3
676676
with:
677677
submodules: recursive
678-
- uses: nuget/setup-nuget@v1
679-
with:
680-
nuget-version: '5.8.x'
678+
- name: Setup Visual Studio environment
679+
uses: microsoft/setup-msbuild@v1
681680
- name: Fetch dependencies
682681
run: |
683682
choco install winflexbison3
@@ -698,8 +697,6 @@ jobs:
698697
run: z3 --version
699698
- name: Confirm cvc5 solver is available and log the version installed
700699
run: cvc5 --version
701-
- name: Setup Visual Studio environment
702-
uses: microsoft/setup-msbuild@v1
703700
- name: Prepare ccache
704701
uses: actions/cache@v3
705702
with:
@@ -733,9 +730,8 @@ jobs:
733730
- uses: actions/checkout@v3
734731
with:
735732
submodules: recursive
736-
- uses: nuget/setup-nuget@v1
737-
with:
738-
nuget-version: '5.8.x'
733+
- name: Setup MSBuild
734+
uses: microsoft/setup-msbuild@v1
739735
- name: Fetch dependencies
740736
run: |
741737
choco install -y winflexbison3 strawberryperl wget
@@ -758,8 +754,6 @@ jobs:
758754
run: z3 --version
759755
- name: Confirm cvc5 solver is available and log the version installed
760756
run: cvc5 --version
761-
- name: Setup MSBuild
762-
uses: microsoft/setup-msbuild@v1
763757
- name: Initialise Developer Command Line
764758
uses: ilammy/msvc-dev-cmd@v1
765759
- name: Prepare ccache
@@ -805,9 +799,8 @@ jobs:
805799
- uses: actions/checkout@v3
806800
with:
807801
submodules: recursive
808-
- uses: nuget/setup-nuget@v1
809-
with:
810-
nuget-version: '5.8.x'
802+
- name: Setup Visual Studio environment
803+
uses: microsoft/setup-msbuild@v1
811804
- name: Fetch dependencies
812805
run: |
813806
choco install winflexbison3
@@ -818,8 +811,6 @@ jobs:
818811
}
819812
nuget install clcache -OutputDirectory "c:\tools" -ExcludeVersion -Version 4.1.0
820813
echo "c:\tools\clcache\clcache-4.1.0" >> $env:GITHUB_PATH
821-
- name: Setup Visual Studio environment
822-
uses: microsoft/setup-msbuild@v1
823814
- name: Prepare ccache
824815
uses: actions/cache@v3
825816
with:

.github/workflows/release-packages.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,16 +187,13 @@ jobs:
187187
- uses: actions/checkout@v3
188188
with:
189189
submodules: recursive
190-
- uses: nuget/setup-nuget@v1
191-
with:
192-
nuget-version: '5.8.x'
190+
- name: Setup Visual Studio environment
191+
uses: microsoft/setup-msbuild@v1
193192
- name: Fetch dependencies
194193
run: |
195194
choco install winflexbison3
196195
nuget install clcache -OutputDirectory "c:\tools" -ExcludeVersion -Version 4.1.0
197196
echo "c:\tools\clcache\clcache-4.1.0" >> $env:GITHUB_PATH
198-
- name: Setup Visual Studio environment
199-
uses: microsoft/setup-msbuild@v1
200197
- name: Setup code sign environment
201198
run: |
202199
echo "$(Split-Path -Path $(Get-ChildItem -Path "${env:ProgramFiles(x86)}\Windows Kits\10\App Certification Kit\signtool.exe"))" >> $env:GITHUB_PATH

0 commit comments

Comments
 (0)