From b9c6955f368fd8fc3efcabea3951cf284486fe3e Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Mon, 23 Oct 2023 08:52:05 -0500 Subject: [PATCH 1/5] GitHub Actions: allow "workflow_dispatch" --- .github/workflows/face.yml | 1 + .github/workflows/fuzz.yml | 1 + .github/workflows/linux.yml | 1 + .github/workflows/windows.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/face.yml b/.github/workflows/face.yml index 839228c30efbd..de2a95353adf9 100644 --- a/.github/workflows/face.yml +++ b/.github/workflows/face.yml @@ -5,6 +5,7 @@ on: pull_request: schedule: - cron: '0 1 * * SUN' + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml index 6395abffbb1dd..b39bc8284614e 100644 --- a/.github/workflows/fuzz.yml +++ b/.github/workflows/fuzz.yml @@ -5,6 +5,7 @@ on: pull_request: schedule: - cron: '0 1 * * SUN' + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 1ece5183ba4fb..207632f7b8367 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -5,6 +5,7 @@ on: pull_request: schedule: - cron: '0 1 * * SUN' + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 63171f9814a7b..a198560d981b8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -5,6 +5,7 @@ on: pull_request: schedule: - cron: '0 1 * * SUN' + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.ref }} From 3f46f14396a6654e52aaf99c69bb5b7c71f83e78 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Thu, 14 Dec 2023 14:33:33 -0600 Subject: [PATCH 2/5] Updated GitHub Actions vcpkgGitCommitId --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a198560d981b8..e8377e2495dd9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -98,7 +98,7 @@ jobs: - name: Install vcpkg uses: lukka/run-vcpkg@v7 with: - vcpkgGitCommitId: b86c0c35b88e2bf3557ff49dc831689c2f085090 + vcpkgGitCommitId: a42af01b72c28a8e1d7b48107b33e4f286a55ef6 vcpkgArguments: --recurse ${{ matrix.vcpkgpackages }} vcpkgTriplet: ${{ matrix.vcpkgarch }} appendedCacheKey: ${{ matrix.name }} From 72262cdbc1bf51bafb73cb96174a48d8d3f85027 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Thu, 14 Dec 2023 15:14:32 -0600 Subject: [PATCH 3/5] Update run-vcpkg version --- .github/workflows/windows.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e8377e2495dd9..e359d36f8d594 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -95,13 +95,15 @@ jobs: with: repository: DOCGroup/MPC path: ${{ env.MPC_ROOT }} + - name: create vcpkg.json + run: | + '{"name": "tao", "version-string": "githubaction", "dependencies": [ ${{ matrix.vcpkgpackages }} ]}' > vcpkg.json + shell: pwsh - name: Install vcpkg - uses: lukka/run-vcpkg@v7 + uses: lukka/run-vcpkg@v11 with: vcpkgGitCommitId: a42af01b72c28a8e1d7b48107b33e4f286a55ef6 - vcpkgArguments: --recurse ${{ matrix.vcpkgpackages }} - vcpkgTriplet: ${{ matrix.vcpkgarch }} - appendedCacheKey: ${{ matrix.name }} + runVcpkgInstall: true - name: create $ACE_ROOT/ace/config.h run: | '#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h From eef377c59d8eee5ada9efa0804229393e82765c9 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Thu, 14 Dec 2023 15:23:00 -0600 Subject: [PATCH 4/5] Updated vcpkgpackages from space-separated to JSON list --- .github/workflows/windows.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e359d36f8d594..32d2e455ea3be 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -24,7 +24,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x64-windows vcpkglibdir: debug/lib - vcpkgpackages: 'openssl xerces-c[xmlch-wchar]' + vcpkgpackages: '"openssl", {"name": "xerces-c", "features": ["xmlch-wchar"]}' OptionalFeatures: uses_wchar=1 - name: VS2019Debug64 vmimage: windows-2019 @@ -33,7 +33,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x64-windows vcpkglibdir: debug/lib - vcpkgpackages: openssl xerces-c + vcpkgpackages: '"openssl", "xerces-c"' - name: VS2019Release64 vmimage: windows-2019 mpctype: vs2019 @@ -41,7 +41,7 @@ jobs: BuildConfiguration: Release vcpkgarch: x64-windows vcpkglibdir: lib - vcpkgpackages: openssl xerces-c + vcpkgpackages: '"openssl", "xerces-c"' - name: VS2019Debug32 vmimage: windows-2019 mpctype: vs2019 @@ -49,7 +49,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x86-windows vcpkglibdir: debug/lib - vcpkgpackages: openssl xerces-c + vcpkgpackages: '"openssl", "xerces-c"' - name: VS2019Release32 vmimage: windows-2019 mpctype: vs2019 @@ -57,7 +57,7 @@ jobs: BuildConfiguration: Release vcpkgarch: x86-windows vcpkglibdir: lib - vcpkgpackages: openssl xerces-c + vcpkgpackages: '"openssl", "xerces-c"' - name: VS2019Debug64Cxx17 vmimage: windows-2019 mpctype: vs2019 @@ -65,7 +65,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x64-windows vcpkglibdir: debug/lib - vcpkgpackages: openssl xerces-c zlib + vcpkgpackages: '"openssl", "xerces-c", "zlib"' OptionalMpcArgs: -value_template LanguageStandard=stdcpp17 - name: VS2019Debug64Cxx20 vmimage: windows-2019 @@ -74,7 +74,7 @@ jobs: BuildConfiguration: Debug vcpkgarch: x64-windows vcpkglibdir: debug/lib - vcpkgpackages: openssl xerces-c zlib + vcpkgpackages: '"openssl", "xerces-c", "zlib"' OptionalMpcArgs: -value_template LanguageStandard=stdcpp20 runs-on: ${{ matrix.vmimage }} name: ${{ matrix.name }} From 340f69d364ce0ffdfccfa7d32a4567836f8334ea Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Fri, 15 Dec 2023 09:33:15 -0600 Subject: [PATCH 5/5] Additional vcpkg settings from #1888 --- .github/workflows/windows.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 32d2e455ea3be..5e0382e82d902 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -83,10 +83,12 @@ jobs: TAO_ROOT: ${{ github.workspace }}/TAO MPC_ROOT: ${{ github.workspace }}/MPC VCPKG_ROOT: ${{ github.workspace }}/vcpkg - XERCESC_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include - XERCESC_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} - SSL_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include - SSL_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} + XERCESC_INCDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/include + XERCESC_LIBDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} + SSL_INCDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/include + SSL_LIBDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} + VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkgarch }} + VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed steps: - name: checkout ACE/TAO uses: actions/checkout@v2