Skip to content

Commit

Permalink
Merge branch 'master' into bugfix_ossf_scorecard
Browse files Browse the repository at this point in the history
  • Loading branch information
BenjamenMeyer committed Nov 27, 2023
2 parents 10bc5af + 6b5262e commit 6fea6a8
Show file tree
Hide file tree
Showing 10 changed files with 288 additions and 402 deletions.
60 changes: 2 additions & 58 deletions .github/workflows/Windows-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,67 +22,11 @@ jobs:
- os: windows-2019
cmake-generator: VS2019Win64
enable-pie: 1
build-type: Debug
- os: windows-2019
cmake-generator: VS2019Win64
enable-pie: 1
build-type: Release
- os: windows-2019
cmake-generator: VS2019Win64
enable-pie: 0
build-type: Debug
- os: windows-2019
cmake-generator: VS2019Win64
enable-pie: 0
build-type: Release
# - os: windows-2019
# cmake-generator: ninja
# enable-pie: 1
# build-type: Debug
# - os: windows-2019
# cmake-generator: ninja
# enable-pie: 1
# build-type: Release
# - os: windows-2019
# cmake-generator: ninja
# enable-pie: 0
# build-type: Debug
# - os: windows-2019
# cmake-generator: ninja
# enable-pie: 0
# build-type: Release
- os: windows-2022
cmake-generator: VS2022Win64
enable-pie: 1
build-type: Debug
- os: windows-2022
cmake-generator: VS2022Win64
enable-pie: 1
build-type: Release
- os: windows-2022
cmake-generator: VS2022Win64
enable-pie: 0
build-type: Debug
- os: windows-2022
cmake-generator: VS2022Win64
enable-pie: 0
build-type: Release
# - os: windows-2022
# cmake-generator: ninja
# enable-pie: 1
# build-type: Debug
# - os: windows-2022
# cmake-generator: ninja
# enable-pie: 1
# build-type: Release
# - os: windows-2022
# cmake-generator: ninja
# enable-pie: 0
# build-type: Debug
# - os: windows-2022
# cmake-generator: ninja
# enable-pie: 0
# build-type: Release

env:
# Indicates the location of vcpkg
Expand Down Expand Up @@ -140,7 +84,7 @@ jobs:
- name: install-vcpkg
#if: steps.cache.outputs.cache-hit != 'true'
run: |
git clone https://github.com/stephengtuggy/vcpkg-local.git ${{ env.VCPKG_ROOT }}
git clone https://github.com/vegastrike/vcpkg-local.git ${{ env.VCPKG_ROOT }}
${{ env.VCPKG_ROOT }}\bootstrap-vcpkg.bat -disableMetrics
- name: run-build-script
Expand All @@ -155,7 +99,7 @@ jobs:
run: .\script\test.ps1 -Generator ${{ matrix.cmake-generator }} -EnablePIE ${{ matrix.enable-pie }} -BuildType ${{ matrix.build-type }}

- name: Upload test results
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 #v3.1.3
if: failure()
with:
name: test_results_xml
Expand Down
Loading

0 comments on commit 6fea6a8

Please sign in to comment.