Skip to content

Commit

Permalink
Fix Windows Build
Browse files Browse the repository at this point in the history
  • Loading branch information
Mab879 committed Jan 2, 2024
1 parent 4aa5b7a commit 89dda65
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
build-macos:
# The type of runner that the job will run on
name: Build, Test on MacOS X Latest
name: Build, Test on macOS Latest
runs-on: macos-latest

# Steps represent a sequence of tasks that will be executed as part of the job
Expand Down Expand Up @@ -115,7 +115,6 @@ jobs:
runs-on: windows-latest
env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
VCPKG_DISABLE_METRICS: "true"
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -129,7 +128,7 @@ jobs:

- name: Bootstrap vcpkg
shell: pwsh
run: "${{ github.workspace }}/vcpkg/scipts/bootstrap.ps1"
run: "${{ github.workspace }}\\vcpkg\\scripts\\bootstrap.ps1 -disableMetrics"

- name: Export GitHub Actions cache environment variables
uses: actions/github-script@v7
Expand All @@ -139,18 +138,17 @@ jobs:
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
- name: Install Deps
run: vcpkg install curl libxml2 libxslt bzip2 pcre pthreads zlib getopt-win32 xmlsec
run: "${{ github.workspace }}\\vcpkg\\vcpkg.exe install curl libxml2 libxslt bzip2 pcre pthreads zlib getopt-win32 xmlsec --triplet x64-windows"

- name: Configure
working-directory: ./build
run: cmake -DENABLE_PYTHON3=FALSE -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake ..
run: cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON3=FALSE -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake ..

- name: Build
run: cmake --build -j 2
working-directory: ./build
run: cmake --build ./build -j 2

- name: Package
run: cpack
run: cpack -G WIX -C Release -P OpenSCAP

- name: Upload Artifacts
uses: actions/upload-artifact@v4
Expand Down

0 comments on commit 89dda65

Please sign in to comment.