diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-10-17 10:44:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-17 10:44:11 +0200 |
| commit | fbca24798130651fe843fe4863fbb2c2078c025a (patch) | |
| tree | 104ac71e7e6379340b27ac6698e46e81aca98a7c | |
| parent | f6f7d5f180f899968c43961dabdd333ddafa7b92 (diff) | |
| parent | 25654dbfacce21319b466a1a35665d0eb60c34cd (diff) | |
| download | MPC-pin-3.21.tar.gz | |
Merge branch 'master' into pin-3.21pin-3.21
| -rw-r--r-- | .github/workflows/fuzz.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/linux.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/macosx.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/windows.yml | 21 |
4 files changed, 22 insertions, 10 deletions
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml index 5e2857c1..b2378128 100644 --- a/.github/workflows/fuzz.yml +++ b/.github/workflows/fuzz.yml @@ -11,6 +11,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true +permissions: + contents: read + env: DOC_ROOT: ${{ github.workspace }}/ACE ACE_ROOT: ${{ github.workspace }}/ACE/ACE diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c21de417..228b0b69 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -11,6 +11,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true +permissions: + contents: read + jobs: build: strategy: diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml index fcdb8458..d44db28d 100644 --- a/.github/workflows/macosx.yml +++ b/.github/workflows/macosx.yml @@ -11,12 +11,15 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true +permissions: + contents: read + jobs: build: strategy: matrix: cxxstd: ["11"] - os: [macos-10.15, macos-11.0] + os: [macos-11, macos-12] include: - platform_file: include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU runs-on: ${{ matrix.os }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7307a29f..3b53f91b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -11,20 +11,15 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true +permissions: + contents: read + jobs: build: strategy: fail-fast: false matrix: include: - - name: VS2017Debug64 - vmimage: windows-2016 - mpctype: vs2017 - BuildPlatform: x64 - BuildConfiguration: Debug - vcpkgarch: x64-windows - vcpkglibdir: debug/lib - vcpkgpackages: openssl xerces-c zlib - name: VS2019Debug64 vmimage: windows-2019 mpctype: vs2019 @@ -49,6 +44,14 @@ jobs: vcpkgarch: x64-windows vcpkglibdir: debug/lib vcpkgpackages: openssl xerces-c zlib + - name: VS2022Release32 + vmimage: windows-2022 + mpctype: vs2022 + BuildPlatform: Win32 + BuildConfiguration: Release + vcpkgarch: x86-windows + vcpkglibdir: lib + vcpkgpackages: openssl xerces-c zlib runs-on: ${{ matrix.vmimage }} name: ${{ matrix.name }} env: @@ -74,7 +77,7 @@ jobs: - name: Install vcpkg uses: lukka/run-vcpkg@v7 with: - vcpkgGitCommitId: 70033dbb31527fb3e69654731f540f59c87787f9 + vcpkgGitCommitId: b86c0c35b88e2bf3557ff49dc831689c2f085090 vcpkgArguments: --recurse ${{ matrix.vcpkgpackages }} vcpkgTriplet: ${{ matrix.vcpkgarch }} appendedCacheKey: ${{ matrix.name }} |