Merge pull request #2173 from DOCGroup/ace6-workflows

[ACE 6] GitHub Actions: allow "workflow_dispatch" and update vpckg action
DOCGroup · Dec 15, 2023 · cca5af5 · cca5af5
2 parents a98ee19 + 340f69d
commit cca5af5
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -5,6 +5,7 @@ on:
   pull_request:
   schedule:
     - cron: '0 1 * * SUN'
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -23,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
@@ -32,39 +33,39 @@ jobs:
             BuildConfiguration: Debug
             vcpkgarch: x64-windows
             vcpkglibdir: debug/lib
-            vcpkgpackages: openssl xerces-c
+            vcpkgpackages: '"openssl", "xerces-c"'
           - name: VS2019Release64
             vmimage: windows-2019
             mpctype: vs2019
             BuildPlatform: x64
             BuildConfiguration: Release
             vcpkgarch: x64-windows
             vcpkglibdir: lib
-            vcpkgpackages: openssl xerces-c
+            vcpkgpackages: '"openssl", "xerces-c"'
           - name: VS2019Debug32
             vmimage: windows-2019
             mpctype: vs2019
             BuildPlatform: Win32
             BuildConfiguration: Debug
             vcpkgarch: x86-windows
             vcpkglibdir: debug/lib
-            vcpkgpackages: openssl xerces-c
+            vcpkgpackages: '"openssl", "xerces-c"'
           - name: VS2019Release32
             vmimage: windows-2019
             mpctype: vs2019
             BuildPlatform: Win32
             BuildConfiguration: Release
             vcpkgarch: x86-windows
             vcpkglibdir: lib
-            vcpkgpackages: openssl xerces-c
+            vcpkgpackages: '"openssl", "xerces-c"'
           - name: VS2019Debug64Cxx17
             vmimage: windows-2019
             mpctype: vs2019
             BuildPlatform: x64
             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
@@ -73,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 }}
@@ -82,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
@@ -94,13 +97,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: b86c0c35b88e2bf3557ff49dc831689c2f085090
-        vcpkgArguments: --recurse ${{ matrix.vcpkgpackages }}
-        vcpkgTriplet: ${{ matrix.vcpkgarch }}
-        appendedCacheKey: ${{ matrix.name }}
+        vcpkgGitCommitId: a42af01b72c28a8e1d7b48107b33e4f286a55ef6
+        runVcpkgInstall: true
     - name: create $ACE_ROOT/ace/config.h
       run: |
         '#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h