Skip to content

Commit

Permalink
CI側のビルド設定を修正する
Browse files Browse the repository at this point in the history
vcpkg integrate installする
  • Loading branch information
berryzplus committed Jun 18, 2024
1 parent 20fe6a2 commit f1cce9d
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build-sakura.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ jobs:
}
shell: pwsh

- name: Install vcpkg
run: vcpkg.exe integrate install

- name: MSBuild
run: build-sln.bat ${{ matrix.platform }} ${{ matrix.config }}
shell: cmd
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/sonarscan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ jobs:
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1

- name: Install vcpkg
run: vcpkg.exe integrate install

- name: Fetch Build-Wrapper
working-directory: ${{ github.workspace }}\.sonar
run: |
Expand Down
3 changes: 2 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ configuration:
- Release

platform:
- Win32
- x64

# comment-out clone_depth to fetch entire repository.
Expand All @@ -30,6 +29,8 @@ install:
py.exe -m pip install openpyxl --user
cup innosetup
C:\ProgramData\chocolatey\tools\shimgen.exe --output=C:\ProgramData\chocolatey\bin\ISCC.exe --path="C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
chcp 65001
vcpkg.exe integrate install
# to run our custom scripts instead of automatic MSBuild
build_script:
Expand Down
2 changes: 0 additions & 2 deletions build-gnu.bat
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ path=C:\msys64\usr\bin;%path:C:\msys64\usr\bin;=%
path=C:\msys64\mingw64\bin;%path:C:\msys64\mingw64\bin;=%
path=%path%;%VCPKG_INSTALLATION_ROOT%

vcpkg.exe integrate install

:: find generic tools
if not defined CMD_NINJA call %~dp0tools\find-tools.bat

Expand Down
3 changes: 3 additions & 0 deletions ci/azure-pipelines/template.job.build-on-msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ jobs:

- template: /ci/azure-pipelines/template.steps.install-mingw-w64-gcc.yml

- pwsh: $(VCPKG_INSTALLATION_ROOT)\vcpkg.exe integrate install
displayName: Install vcpkg

# Build GNU C++
- script: build-gnu.bat $(BuildPlatform) $(Configuration)
displayName: Build with MinGW-w64-gcc
Expand Down
3 changes: 3 additions & 0 deletions ci/azure-pipelines/template.job.build-unittest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ jobs:

- template: /ci/azure-pipelines/template.steps.install-python-modules.yml

- pwsh: $(VCPKG_INSTALLATION_ROOT)\vcpkg.exe integrate install
displayName: Install vcpkg

# Build solution
- script: build-sln.bat $(BuildPlatform) $(Configuration)
displayName: Build solution
Expand Down

0 comments on commit f1cce9d

Please sign in to comment.