actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CI - replace Windows installation step with microsoft/setup-msbuild

Browse Source
This commit is contained in:
Scott Brenner
2025-05-13 21:41:27 -07:00
committed by teejusb
parent 25b57c13d5
commit 6a981ac5f7
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+6 -3
View File
@@ -40,9 +40,6 @@ jobs:
- os: windows-latest - os: windows-latest
name: Windows name: Windows
arch: x64 arch: x64
install: |
$vsPath = &"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
&"$vsPath\VC\Auxiliary\Build\vcvarsall.bat" x64
configure: cmake -B build -DWITH_FFMPEG_JOBS="$env:NUMBER_OF_PROCESSORS" configure: cmake -B build -DWITH_FFMPEG_JOBS="$env:NUMBER_OF_PROCESSORS"
build: cmake --build build --parallel "$env:NUMBER_OF_PROCESSORS" build: cmake --build build --parallel "$env:NUMBER_OF_PROCESSORS"
name: ${{ matrix.name }} name: ${{ matrix.name }}
@@ -59,7 +56,13 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}-${{ matrix.arch }}-cmake-build- ${{ runner.os }}-${{ matrix.arch }}-cmake-build-
- name: Install dependencies - name: Install dependencies
if: matrix.os != 'windows-latest'
run: ${{ matrix.install }} run: ${{ matrix.install }}
- name: Add msbuild to PATH
if: matrix.os == 'windows-latest'
uses: microsoft/setup-msbuild@v2
with:
msbuild-architecture: x64
- name: Configure - name: Configure
run: ${{ matrix.configure }} run: ${{ matrix.configure }}
- name: Build - name: Build
.github/workflows/nightly.yml
+6 -5
View File
@@ -45,9 +45,6 @@ jobs:
- os: windows-latest - os: windows-latest
name: Windows name: Windows
arch: x64 arch: x64
install: |
$vsPath = &"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
&"$vsPath\VC\Auxiliary\Build\vcvarsall.bat" x64
configure: cmake -B build -DWITH_FFMPEG_JOBS="$env:NUMBER_OF_PROCESSORS" configure: cmake -B build -DWITH_FFMPEG_JOBS="$env:NUMBER_OF_PROCESSORS"
release: | release: |
cmake -B build -DWITH_FULL_RELEASE=Off -DWITH_NIGHTLY_RELEASE=On -DWITH_CLUB_FANTASTIC=Off cmake -B build -DWITH_FULL_RELEASE=Off -DWITH_NIGHTLY_RELEASE=On -DWITH_CLUB_FANTASTIC=Off
@@ -68,9 +65,13 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}-${{ matrix.arch }}-cmake-build- ${{ runner.os }}-${{ matrix.arch }}-cmake-build-
- name: Install dependencies - name: Install dependencies
if: matrix.os != 'windows-latest'
run: ${{ matrix.install }} run: ${{ matrix.install }}
- name: Configure - name: Add msbuild to PATH
run: ${{ matrix.configure }} if: matrix.os == 'windows-latest'
uses: microsoft/setup-msbuild@v2
with:
msbuild-architecture: x64
- name: Create nightly release - name: Create nightly release
run: ${{ matrix.release }} run: ${{ matrix.release }}
- name: Upload artifacts - name: Upload artifacts