From 4df89322a126f6a01fd3401d924aa22c8b4ca239 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 12:51:35 +0200 Subject: Starter windows file --- .github/workflows/windows.yml | 142 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 .github/workflows/windows.yml diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 00000000000..cb879b61d7b --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,142 @@ +name: windows + +on: + push: + pull_request: + schedule: + - cron: '0 7 * * SUN' + +jobs: + build: + strategy: + matrix: + include: + - name: VS2017WChar + vmimage: windows-2016 + mpctype: vs2017 + BuildPlatform: x64 + BuildConfiguration: Debug + vcpkgarch: x64-windows + vcpkglibdir: debug\lib + vcpkgpackages: 'openssl xerces-c[xmlch-wchar]' + OptionalFeatures: uses_wchar=1 + - name: VS2017Debug64 + vmimage: windows-2016 + mpctype: vs2017 + BuildPlatform: x64 + BuildConfiguration: Debug + vcpkgarch: x64-windows + vcpkglibdir: debug\lib + vcpkgpackages: openssl xerces-c + - name: VS2017Release64 + vmimage: windows-2016 + mpctype: vs2017 + BuildPlatform: x64 + BuildConfiguration: Release + vcpkgarch: x64-windows + vcpkglibdir: lib + vcpkgpackages: openssl xerces-c + - name: VS2019WChar + vmimage: windows-2019 + mpctype: vs2019 + BuildPlatform: x64 + BuildConfiguration: Debug + vcpkgarch: x64-windows + vcpkglibdir: debug\lib + vcpkgpackages: 'openssl xerces-c[xmlch-wchar]' + OptionalFeatures: uses_wchar=1 + - name: VS2019Debug64 + vmimage: windows-2019 + mpctype: vs2019 + BuildPlatform: x64 + BuildConfiguration: Debug + vcpkgarch: x64-windows + vcpkglibdir: debug\lib + vcpkgpackages: openssl xerces-c + - name: VS2019Release64 + vmimage: windows-2019 + mpctype: vs2019 + BuildPlatform: x64 + BuildConfiguration: Release + vcpkgarch: x64-windows + vcpkglibdir: lib + 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 + - name: VS2019Release32 + vmimage: windows-2019 + mpctype: vs2019 + BuildPlatform: Win32 + BuildConfiguration: Release + vcpkgarch: x86-windows + vcpkglibdir: lib + vcpkgpackages: openssl xerces-c + runs-on: ${{ matrix.vmimage }} + name: ${{ matrix.name }} + env: + ACE_ROOT: ${{ github.workspace }}/ACE + TAO_ROOT: ${{ github.workspace }}/TAO + MPC_ROOT: ${{ github.workspace }}/MPC + VCPKG_ROOT: ${{ github.workspace }}/vcpkg + XERCESC_INCDIR: ${{ github.workspace }}/installed/${{ matrix.vcpkgarch }}/include + XERCESC_LIBDIR: ${{ github.workspace }}/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} + SSL_INCDIR: ${{ github.workspace }}/installed/${{ matrix.vcpkgarch }}/include + SSL_LIBDIR: ${{ github.workspace }}/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} + steps: + - name: checkout ACE/TAO + uses: actions/checkout@v2 + - name: checkout MPC + uses: actions/checkout@v2 + with: + repository: DOCGroup/MPC + path: MPC + - name: checkout vcpkg + uses: actions/checkout@v2 + with: + repository: Microsoft/vcpkg + path: vcpkg + - name: Install additional packages using vcpkg + run: | + ${env:VCPKG_ROOT}\bootstrap-vcpkg.bat + ${env:VCPKG_ROOT}\vcpkg install --recurse --triplet ${env:vcpkgarch} ${env:vcpkgpackages} + shell: pwsh + - name: create $ACE_ROOT/ace/config.h + run: | + '#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h + shell: pwsh + - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU + run: | + 'ipv6=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + 'xerces3=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + 'ssl=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + '${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU + shell: pwsh + - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features + run: | + echo "ipv6=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + echo "xerces3=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + echo "ssl=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + echo "versioned_namespace=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + shell: pwsh + - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc + run: | + perl ${env:ACE_ROOT}/bin/mwc.pl -type {{ matrix.mpctype }} ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4 + shell: pwsh + - name: Run mwc.pl on $(ACE_ROOT)/tests/tests.mwc + run: | + perl ${env:ACE_ROOT}/bin/mwc.pl -type {{ matrix.mpctype }} ${env:ACE_ROOT}/tests/tests.mwc -workers 4 + shell: pwsh + - name: Build TAO_ACE project + run: | + make -j 6 -C ${env:TAO_ROOT} + shell: pwsh + - name: Build ACE/tests project + run: | + make -j 6 -C ${env:ACE_ROOT}/tests + shell: pwsh -- cgit v1.2.1 From 7eac7289b4d042d6d76a2999fc6fa6cda764715a Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 12:57:51 +0200 Subject: More tweaks * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index cb879b61d7b..ebd22c05beb 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -124,6 +124,12 @@ jobs: echo "ssl=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features echo "versioned_namespace=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features shell: pwsh + + - powershell: | + echo $(OptionalFeatures) | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features + displayName: Add optional features ($(OptionalFeatures)) + condition: and(succeeded(), ne(variables['OptionalFeatures'], '')) + - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc run: | perl ${env:ACE_ROOT}/bin/mwc.pl -type {{ matrix.mpctype }} ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4 @@ -132,11 +138,17 @@ jobs: run: | perl ${env:ACE_ROOT}/bin/mwc.pl -type {{ matrix.mpctype }} ${env:ACE_ROOT}/tests/tests.mwc -workers 4 shell: pwsh - - name: Build TAO_ACE project - run: | - make -j 6 -C ${env:TAO_ROOT} - shell: pwsh - - name: Build ACE/tests project - run: | - make -j 6 -C ${env:ACE_ROOT}/tests - shell: pwsh + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1.0.1 + - name: Build solution TAO/TAO_ACE.sln + inputs: + solution: TAO/TAO_ACE.sln + platform: $(BuildPlatform) + configuration: $(BuildConfiguration) + maximumCpuCount: true + - name: Build solution ACE/tests/tests.sln + inputs: + solution: ACE/tests/tests.sln + platform: $(BuildPlatform) + configuration: $(BuildConfiguration) + maximumCpuCount: true -- cgit v1.2.1 From 296ed1c40bc0bf95738b71c1a893fe4eaa6396a1 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 13:20:53 +0200 Subject: Different way to setup and use vcpkg * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ebd22c05beb..8f5d3ce2131 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -96,27 +96,18 @@ jobs: with: repository: DOCGroup/MPC path: MPC - - name: checkout vcpkg - uses: actions/checkout@v2 + - name: Install vcpkg + uses: lukka/run-vcpkg@v3 with: - repository: Microsoft/vcpkg - path: vcpkg - - name: Install additional packages using vcpkg + setupOnly: true + - name: Install vcpkg packages run: | - ${env:VCPKG_ROOT}\bootstrap-vcpkg.bat - ${env:VCPKG_ROOT}\vcpkg install --recurse --triplet ${env:vcpkgarch} ${env:vcpkgpackages} + ${env:VCPKG_ROOT}\vcpkg install --recurse --triplet ${matrix.vcpkgarch} ${matrix.vcpkgpackages} shell: pwsh - name: create $ACE_ROOT/ace/config.h run: | '#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h shell: pwsh - - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU - run: | - 'ipv6=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU - 'xerces3=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU - 'ssl=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU - '${{ matrix.platform_file }}' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU - shell: pwsh - name: create $ACE_ROOT/bin/MakeProjectCreator/config/default.features run: | echo "ipv6=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features -- cgit v1.2.1 From 357c8672d2880079fe69286a2a5199aa7106d6c8 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 13:22:13 +0200 Subject: Fixed matrix * .github/workflows/windows.yml: --- .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 8f5d3ce2131..75a1058e235 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -102,7 +102,7 @@ jobs: setupOnly: true - name: Install vcpkg packages run: | - ${env:VCPKG_ROOT}\vcpkg install --recurse --triplet ${matrix.vcpkgarch} ${matrix.vcpkgpackages} + ${env:VCPKG_ROOT}\vcpkg install --recurse --triplet ${{ matrix.vcpkgarch }} ${{ matrix.vcpkgpackages }} shell: pwsh - name: create $ACE_ROOT/ace/config.h run: | -- cgit v1.2.1 From 4a5332b9360d00d0b489c959b553149cc5058b78 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 13:25:59 +0200 Subject: Fixed conditional * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 75a1058e235..db1062a3b72 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -115,12 +115,11 @@ jobs: echo "ssl=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features echo "versioned_namespace=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features shell: pwsh - - - powershell: | - echo $(OptionalFeatures) | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features - displayName: Add optional features ($(OptionalFeatures)) - condition: and(succeeded(), ne(variables['OptionalFeatures'], '')) - + - name: Add optional features ${{ matrix.OptionalFeatures }} + run: | + echo ${{ matrix.OptionalFeatures }} | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + shell: pwsh + if: ${{ matrix.OptionalFeatures }} != '' - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc run: | perl ${env:ACE_ROOT}/bin/mwc.pl -type {{ matrix.mpctype }} ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4 -- cgit v1.2.1 From bcc20559b1ce2e632102e6b0a9a73a51e2dba067 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 13:28:01 +0200 Subject: Yaml fix * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index db1062a3b72..9f781c45533 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -131,13 +131,11 @@ jobs: - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.0.1 - name: Build solution TAO/TAO_ACE.sln - inputs: solution: TAO/TAO_ACE.sln platform: $(BuildPlatform) configuration: $(BuildConfiguration) maximumCpuCount: true - name: Build solution ACE/tests/tests.sln - inputs: solution: ACE/tests/tests.sln platform: $(BuildPlatform) configuration: $(BuildConfiguration) -- cgit v1.2.1 From f59107d5b706c16fab1e8780c32c36cc981eef06 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 13:44:14 +0200 Subject: add build * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9f781c45533..ada73189721 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -128,15 +128,12 @@ jobs: run: | perl ${env:ACE_ROOT}/bin/mwc.pl -type {{ matrix.mpctype }} ${env:ACE_ROOT}/tests/tests.mwc -workers 4 shell: pwsh - - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.0.1 + - uses :microsoft/setup-msbuild@v1.0.1 + arch: ${{ matrix.BuildPlatform }} - name: Build solution TAO/TAO_ACE.sln - solution: TAO/TAO_ACE.sln - platform: $(BuildPlatform) + run: msbuild -maxcpucount TAO/TAO_ACE.sln configuration: $(BuildConfiguration) maximumCpuCount: true - name: Build solution ACE/tests/tests.sln - solution: ACE/tests/tests.sln - platform: $(BuildPlatform) + run: msbuild -maxcpucount ACE/tests/tests.sln configuration: $(BuildConfiguration) - maximumCpuCount: true -- cgit v1.2.1 From d9b16ec8239f950500ddb2aa381d334d2be99065 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 13:45:15 +0200 Subject: Fix * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ada73189721..ef917805a4b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -96,6 +96,8 @@ jobs: with: repository: DOCGroup/MPC path: MPC + - name: Setup Visual Studio + uses: microsoft/setup-msbuild@v1.0.1 - name: Install vcpkg uses: lukka/run-vcpkg@v3 with: @@ -128,8 +130,6 @@ jobs: run: | perl ${env:ACE_ROOT}/bin/mwc.pl -type {{ matrix.mpctype }} ${env:ACE_ROOT}/tests/tests.mwc -workers 4 shell: pwsh - - uses :microsoft/setup-msbuild@v1.0.1 - arch: ${{ matrix.BuildPlatform }} - name: Build solution TAO/TAO_ACE.sln run: msbuild -maxcpucount TAO/TAO_ACE.sln configuration: $(BuildConfiguration) -- cgit v1.2.1 From 18b832e683880e20debc32dc359b9b5254cfe9d2 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 13:45:49 +0200 Subject: Test change * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ef917805a4b..560ddbceba1 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -132,8 +132,5 @@ jobs: shell: pwsh - name: Build solution TAO/TAO_ACE.sln run: msbuild -maxcpucount TAO/TAO_ACE.sln - configuration: $(BuildConfiguration) - maximumCpuCount: true - name: Build solution ACE/tests/tests.sln run: msbuild -maxcpucount ACE/tests/tests.sln - configuration: $(BuildConfiguration) -- cgit v1.2.1 From c551b730d11d204cc4083e91bc94ce427bb87d23 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 13:54:06 +0200 Subject: Tweak build platform * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 560ddbceba1..b27c9cff969 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -96,8 +96,6 @@ jobs: with: repository: DOCGroup/MPC path: MPC - - name: Setup Visual Studio - uses: microsoft/setup-msbuild@v1.0.1 - name: Install vcpkg uses: lukka/run-vcpkg@v3 with: @@ -124,13 +122,15 @@ jobs: if: ${{ matrix.OptionalFeatures }} != '' - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc run: | - perl ${env:ACE_ROOT}/bin/mwc.pl -type {{ matrix.mpctype }} ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4 + perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4 shell: pwsh - name: Run mwc.pl on $(ACE_ROOT)/tests/tests.mwc run: | - perl ${env:ACE_ROOT}/bin/mwc.pl -type {{ matrix.mpctype }} ${env:ACE_ROOT}/tests/tests.mwc -workers 4 + perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:ACE_ROOT}/tests/tests.mwc -workers 4 shell: pwsh + - name: Setup msbuild + uses: microsoft/setup-msbuild@v1.0.1 - name: Build solution TAO/TAO_ACE.sln - run: msbuild -maxcpucount TAO/TAO_ACE.sln + run: msbuild -maxcpucount -p:PlatformTarget=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} TAO/TAO_ACE.sln - name: Build solution ACE/tests/tests.sln - run: msbuild -maxcpucount ACE/tests/tests.sln + run: msbuild -maxcpucount -p:PlatformTarget=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} ACE/tests/tests.sln -- cgit v1.2.1 From 2448b08905ebb67af29dcd12d1ffdde06032a9f0 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 13:59:56 +0200 Subject: Get latest vcpkg * .github/workflows/windows.yml: --- .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 b27c9cff969..c22c0c4b2e6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -96,12 +96,14 @@ jobs: with: repository: DOCGroup/MPC path: MPC - - name: Install vcpkg - uses: lukka/run-vcpkg@v3 + - name: checkout vcpkg + uses: actions/checkout@v2 with: - setupOnly: true - - name: Install vcpkg packages + repository: Microsoft/vcpkg + path: vcpkg + - name: Install vcpkg run: | + ${env:VCPKG_ROOT}\bootstrap-vcpkg.bat ${env:VCPKG_ROOT}\vcpkg install --recurse --triplet ${{ matrix.vcpkgarch }} ${{ matrix.vcpkgpackages }} shell: pwsh - name: create $ACE_ROOT/ace/config.h -- cgit v1.2.1 From 3d180668ff345f0b4fe971d2cc02d26f687d1cc9 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 14:02:06 +0200 Subject: Fixed path * .github/workflows/windows.yml: --- .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 c22c0c4b2e6..1ea856135ce 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -17,7 +17,7 @@ jobs: BuildPlatform: x64 BuildConfiguration: Debug vcpkgarch: x64-windows - vcpkglibdir: debug\lib + vcpkglibdir: debug/lib vcpkgpackages: 'openssl xerces-c[xmlch-wchar]' OptionalFeatures: uses_wchar=1 - name: VS2017Debug64 @@ -26,7 +26,7 @@ jobs: BuildPlatform: x64 BuildConfiguration: Debug vcpkgarch: x64-windows - vcpkglibdir: debug\lib + vcpkglibdir: debug/lib vcpkgpackages: openssl xerces-c - name: VS2017Release64 vmimage: windows-2016 @@ -42,7 +42,7 @@ jobs: BuildPlatform: x64 BuildConfiguration: Debug vcpkgarch: x64-windows - vcpkglibdir: debug\lib + vcpkglibdir: debug/lib vcpkgpackages: 'openssl xerces-c[xmlch-wchar]' OptionalFeatures: uses_wchar=1 - name: VS2019Debug64 @@ -51,7 +51,7 @@ jobs: BuildPlatform: x64 BuildConfiguration: Debug vcpkgarch: x64-windows - vcpkglibdir: debug\lib + vcpkglibdir: debug/lib vcpkgpackages: openssl xerces-c - name: VS2019Release64 vmimage: windows-2019 @@ -67,7 +67,7 @@ jobs: BuildPlatform: Win32 BuildConfiguration: Debug vcpkgarch: x86-windows - vcpkglibdir: debug\lib + vcpkglibdir: debug/lib vcpkgpackages: openssl xerces-c - name: VS2019Release32 vmimage: windows-2019 @@ -103,8 +103,8 @@ jobs: path: vcpkg - name: Install vcpkg run: | - ${env:VCPKG_ROOT}\bootstrap-vcpkg.bat - ${env:VCPKG_ROOT}\vcpkg install --recurse --triplet ${{ matrix.vcpkgarch }} ${{ matrix.vcpkgpackages }} + ${env:VCPKG_ROOT}/bootstrap-vcpkg.bat + ${env:VCPKG_ROOT}/vcpkg install --recurse --triplet ${{ matrix.vcpkgarch }} ${{ matrix.vcpkgpackages }} shell: pwsh - name: create $ACE_ROOT/ace/config.h run: | -- cgit v1.2.1 From 12764670d3961947f64cc4adc5e63d63395b73ec Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 14:07:10 +0200 Subject: different vcpkg bootstrap * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1ea856135ce..79d9cef02e6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -103,8 +103,9 @@ jobs: path: vcpkg - name: Install vcpkg run: | - ${env:VCPKG_ROOT}/bootstrap-vcpkg.bat - ${env:VCPKG_ROOT}/vcpkg install --recurse --triplet ${{ matrix.vcpkgarch }} ${{ matrix.vcpkgpackages }} + cd ${env:VCPKG_ROOT} + .\bootstrap-vcpkg.bat + .\vcpkg install --recurse --triplet ${{ matrix.vcpkgarch }} ${{ matrix.vcpkgpackages }} shell: pwsh - name: create $ACE_ROOT/ace/config.h run: | -- cgit v1.2.1 From fdf759c88f332ea19db1fe3ddbdf6dcc326b04e2 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 14:21:07 +0200 Subject: Quoting change * .github/workflows/windows.yml: --- .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 79d9cef02e6..f2aeaf0c7d3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -120,7 +120,7 @@ jobs: shell: pwsh - name: Add optional features ${{ matrix.OptionalFeatures }} run: | - echo ${{ matrix.OptionalFeatures }} | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + echo "${{ matrix.OptionalFeatures }}" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features shell: pwsh if: ${{ matrix.OptionalFeatures }} != '' - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc -- cgit v1.2.1 From 73b5fde8efc8964542563f20a5385e230b82fef3 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 14:46:50 +0200 Subject: Switch to a released vcpkg release, it will save us a lot of time because of the caching * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f2aeaf0c7d3..3d858890f99 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -96,17 +96,11 @@ jobs: with: repository: DOCGroup/MPC path: MPC - - name: checkout vcpkg - uses: actions/checkout@v2 - with: - repository: Microsoft/vcpkg - path: vcpkg - name: Install vcpkg - run: | - cd ${env:VCPKG_ROOT} - .\bootstrap-vcpkg.bat - .\vcpkg install --recurse --triplet ${{ matrix.vcpkgarch }} ${{ matrix.vcpkgpackages }} - shell: pwsh + uses: lukka/run-vcpkg@v3 + with: + vcpkgGitCommitId: 6185aa76504a5025f36754324abf307cc776f3da + vcpkgArguments: --recurse --triplet ${{ matrix.vcpkgarch }} ${{ matrix.vcpkgpackages }} - name: create $ACE_ROOT/ace/config.h run: | '#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h -- cgit v1.2.1 From f45a8a8e08e15d9fdc4f022a59c32ef656efb7a1 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 14:48:06 +0200 Subject: Attempt to use vcpkg caching * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3d858890f99..3348964fd48 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -100,7 +100,8 @@ jobs: uses: lukka/run-vcpkg@v3 with: vcpkgGitCommitId: 6185aa76504a5025f36754324abf307cc776f3da - vcpkgArguments: --recurse --triplet ${{ matrix.vcpkgarch }} ${{ matrix.vcpkgpackages }} + vcpkgArguments: --recurse ${{ matrix.vcpkgpackages }} + vcpkgTriplet: ${{ matrix.vcpkgarch }} - name: create $ACE_ROOT/ace/config.h run: | '#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h -- cgit v1.2.1 From 1aedb3d5f45e048bd58c6b054102a3f4e8d8acbb Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 14:51:06 +0200 Subject: correct ssl/xerces directories * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3348964fd48..874978ee2bd 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -84,10 +84,10 @@ jobs: TAO_ROOT: ${{ github.workspace }}/TAO MPC_ROOT: ${{ github.workspace }}/MPC VCPKG_ROOT: ${{ github.workspace }}/vcpkg - XERCESC_INCDIR: ${{ github.workspace }}/installed/${{ matrix.vcpkgarch }}/include - XERCESC_LIBDIR: ${{ github.workspace }}/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} - SSL_INCDIR: ${{ github.workspace }}/installed/${{ matrix.vcpkgarch }}/include - SSL_LIBDIR: ${{ github.workspace }}/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 }} steps: - name: checkout ACE/TAO uses: actions/checkout@v2 -- cgit v1.2.1 From b5832b0ae8f5f8acc4161d9aaf912d463b7e9a39 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 14:55:12 +0200 Subject: Update vcpkg to a more recent commit * .github/workflows/windows.yml: --- .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 874978ee2bd..17e216c6e9f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -99,7 +99,7 @@ jobs: - name: Install vcpkg uses: lukka/run-vcpkg@v3 with: - vcpkgGitCommitId: 6185aa76504a5025f36754324abf307cc776f3da + vcpkgGitCommitId: f6948aeb686c015d7b582aa4d76702a2f92602b1 vcpkgArguments: --recurse ${{ matrix.vcpkgpackages }} vcpkgTriplet: ${{ matrix.vcpkgarch }} - name: create $ACE_ROOT/ace/config.h -- cgit v1.2.1 From c29ca7f434f6bdddc5584d5279e2c3f803ac1679 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 15:11:38 +0200 Subject: Correct conditional * .github/workflows/windows.yml: --- .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 17e216c6e9f..95059d1ce39 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -117,7 +117,7 @@ jobs: run: | echo "${{ matrix.OptionalFeatures }}" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features shell: pwsh - if: ${{ matrix.OptionalFeatures }} != '' + if: matrix.OptionalFeatures != '' - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc run: | perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4 -- cgit v1.2.1 From ac3ca11877944b181850e70860bda969263ab2ed Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 15:26:58 +0200 Subject: Use platform for msbuild * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 95059d1ce39..bd27ad2574c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -129,6 +129,6 @@ jobs: - name: Setup msbuild uses: microsoft/setup-msbuild@v1.0.1 - name: Build solution TAO/TAO_ACE.sln - run: msbuild -maxcpucount -p:PlatformTarget=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} TAO/TAO_ACE.sln + run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} TAO/TAO_ACE.sln - name: Build solution ACE/tests/tests.sln - run: msbuild -maxcpucount -p:PlatformTarget=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} ACE/tests/tests.sln + run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} ACE/tests/tests.sln -- cgit v1.2.1 From e50a0637771c992a61c9b7af301d250105623374 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 21:03:14 +0200 Subject: Add openssl feature * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index bd27ad2574c..551ef2bb38a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -111,6 +111,7 @@ jobs: echo "ipv6=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features echo "xerces3=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features echo "ssl=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + echo "openssl=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features echo "versioned_namespace=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features shell: pwsh - name: Add optional features ${{ matrix.OptionalFeatures }} -- cgit v1.2.1 From c0be5b3ad32a121e57babf5832ec62ace55d0bef Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 21:09:43 +0200 Subject: Add badges --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6cae93f9649..f50c1c9b5e3 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,14 @@ [![Lastest release](https://img.shields.io/github/release/docgroup/ace_tao.svg)](https://github.com/DOCGroup/ACE_TAO/releases/latest) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/9a20abe6590a4b3ca946d7634d9f51af)](https://www.codacy.com/app/DOCGroup/ACE_TAO?utm_source=github.com&utm_medium=referral&utm_content=DOCGroup/ACE_TAO&utm_campaign=badger) [![Build Status](https://travis-ci.com/DOCGroup/ACE_TAO.svg?branch=master)](https://travis-ci.com/DOCGroup/ACE_TAO) +[![Linux CI](https://github.com/DOCGroup/ACE_TAO/workflows/linux/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Alinux) +[![Windows CI](https://github.com/DOCGroup/ACE_TAO/workflows/windows/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Awindows) +[![Fuzz CI](https://github.com/DOCGroup/ACE_TAO/workflows/fuzzr/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Afuzzr) +[![MacOSX CI](https://github.com/DOCGroup/ACE_TAO/workflows/macosx/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Amacosx) [![Coverity Scan Build Status](https://scan.coverity.com/projects/1/badge.svg)](https://scan.coverity.com/projects/1) -[![Azure DevOps](https://dev.azure.com/docgroup/ACE_TAO/_apis/build/status/DOCGroup.ACE_TAO?branchName=master)](https://dev.azure.com/docgroup/ACE_TAO/_build/latest?definitionId=7&branchName=master) [![CodeFactor](https://www.codefactor.io/repository/github/docgroup/ace_tao/badge)](https://www.codefactor.io/repository/github/docgroup/ace_tao) + # ACE/TAO # See [Douglas C. Schmidt website](https://www.dre.vanderbilt.edu/~schmidt) for more information about ACE/TAO. The quality of ACE/TAO is monitored through our distributed [scoreboard](https://www.dre.vanderbilt.edu/scoreboard/) -- cgit v1.2.1 From 15379a43b355b73fe7af68b9842a90728d37b212 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 21:10:37 +0200 Subject: Correct fuzz badge * README.md: --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f50c1c9b5e3..bc8ddd192af 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Build Status](https://travis-ci.com/DOCGroup/ACE_TAO.svg?branch=master)](https://travis-ci.com/DOCGroup/ACE_TAO) [![Linux CI](https://github.com/DOCGroup/ACE_TAO/workflows/linux/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Alinux) [![Windows CI](https://github.com/DOCGroup/ACE_TAO/workflows/windows/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Awindows) -[![Fuzz CI](https://github.com/DOCGroup/ACE_TAO/workflows/fuzzr/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Afuzzr) +[![Fuzz CI](https://github.com/DOCGroup/ACE_TAO/workflows/fuzz/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Afuzz) [![MacOSX CI](https://github.com/DOCGroup/ACE_TAO/workflows/macosx/badge.svg)](https://github.com/DOCGroup/ACE_TAO/actions?query=workflow%3Amacosx) [![Coverity Scan Build Status](https://scan.coverity.com/projects/1/badge.svg)](https://scan.coverity.com/projects/1) [![CodeFactor](https://www.codefactor.io/repository/github/docgroup/ace_tao/badge)](https://www.codefactor.io/repository/github/docgroup/ace_tao) -- cgit v1.2.1 From d8d6a3ade3658fb0c47cbf65ac7bd20b0516b1d7 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 21:15:15 +0200 Subject: Removing azure pipeline usage in favor of github actions --- azure-pipelines.yml | 137 ---------------------------------------------------- 1 file changed, 137 deletions(-) delete mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 24f2ceecd80..00000000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,137 +0,0 @@ -variables: - ACE_ROOT: $(Build.SourcesDirectory)/ACE - TAO_ROOT: $(Build.SourcesDirectory)/TAO - MPC_ROOT: $(Build.SourcesDirectory)/ACE/MPC - system.prefergit: true - -schedules: -- cron: "0 7 * * SUN" - displayName: Weekly Sunday - branches: - include: - - master - always: true - -resources: -- repo: self - fetchDepth: 1 - -jobs: -- job: Windows - timeoutInMinutes: 120 - strategy: - matrix: - VS2019WChar: - vmimage: windows-2019 - mpctype: vs2019 - BuildPlatform: x64 - BuildConfiguration: Debug - vcpkgarch: x64-windows - vcpkglibdir: debug\lib - vcpkgpackages: 'openssl xerces-c[xmlch-wchar]' - OptionalFeatures: uses_wchar=1 - VS2019Debug64: - vmimage: windows-2019 - mpctype: vs2019 - BuildPlatform: x64 - BuildConfiguration: Debug - vcpkgarch: x64-windows - vcpkglibdir: debug\lib - vcpkgpackages: openssl xerces-c - VS2019Release64: - vmimage: windows-2019 - mpctype: vs2019 - BuildPlatform: x64 - BuildConfiguration: Release - vcpkgarch: x64-windows - vcpkglibdir: lib - vcpkgpackages: openssl xerces-c - VS2019Debug32: - vmimage: windows-2019 - mpctype: vs2019 - BuildPlatform: Win32 - BuildConfiguration: Debug - vcpkgarch: x86-windows - vcpkglibdir: debug\lib - vcpkgpackages: openssl xerces-c - VS2019Release32: - vmimage: windows-2019 - mpctype: vs2019 - BuildPlatform: Win32 - BuildConfiguration: Release - vcpkgarch: x86-windows - vcpkglibdir: lib - vcpkgpackages: openssl xerces-c - VS2017WChar: - vmimage: vs2017-win2016 - mpctype: vs2017 - BuildPlatform: x64 - BuildConfiguration: Debug - vcpkgarch: x64-windows - vcpkglibdir: debug\lib - vcpkgpackages: 'openssl xerces-c[xmlch-wchar]' - OptionalFeatures: uses_wchar=1 - VS2017Debug64: - vmimage: vs2017-win2016 - mpctype: vs2017 - BuildPlatform: x64 - BuildConfiguration: Debug - vcpkgarch: x64-windows - vcpkglibdir: debug\lib - vcpkgpackages: openssl xerces-c - VS2017Release64: - vmimage: vs2017-win2016 - mpctype: vs2017 - BuildPlatform: x64 - BuildConfiguration: Release - vcpkgarch: x64-windows - vcpkglibdir: lib - vcpkgpackages: openssl xerces-c - pool: - vmImage: $(vmimage) - variables: - VCPKG_ROOT: $(Build.SourcesDirectory)\vcpkg - XERCESC_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include - XERCESC_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\$(vcpkglibdir) - SSL_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include - SSL_LIBDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\$(vcpkglibdir) - steps: - - powershell: | - git clone -q --depth 1 git://github.com/Microsoft/vcpkg.git $(VCPKG_ROOT) - $(VCPKG_ROOT)\bootstrap-vcpkg.bat - $(VCPKG_ROOT)\vcpkg install --recurse --triplet $(vcpkgarch) $(vcpkgpackages) - displayName: Install additional packages using vcpkg - - powershell: | - '#include "ace/config-win32.h"' > $(ACE_ROOT)/ace/config.h - displayName: Create config.h file - - powershell: | - echo "ipv6=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features - echo "xerces3=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features - echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features - echo "openssl11=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features - echo "versioned_namespace=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features - displayName: Create default.features file - - powershell: | - echo $(OptionalFeatures) | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features - displayName: Add optional features ($(OptionalFeatures)) - condition: and(succeeded(), ne(variables['OptionalFeatures'], '')) - - powershell: git clone -q --depth 1 git://github.com/DOCGroup/MPC.git $(MPC_ROOT) - displayName: git clone MPC - - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type $(mpctype) $(TAO_ROOT)/TAO_ACE.mwc -workers 4 - displayName: Run script mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc - - powershell: perl $(ACE_ROOT)/bin/mwc.pl -type $(mpctype) $(ACE_ROOT)/tests/tests.mwc -workers 4 - displayName: Run script mwc.pl on $(ACE_ROOT)/tests/tests.mwc - - task: VSBuild@1 - displayName: Build solution TAO/TAO_ACE.sln - inputs: - solution: TAO/TAO_ACE.sln - platform: $(BuildPlatform) - configuration: $(BuildConfiguration) - maximumCpuCount: true - - task: VSBuild@1 - displayName: Build solution ACE/tests/tests.sln - inputs: - solution: ACE/tests/tests.sln - platform: $(BuildPlatform) - configuration: $(BuildConfiguration) - maximumCpuCount: true -- cgit v1.2.1 From 237db0a3e73058fb2941e100eff157190a3cef89 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Aug 2020 21:52:04 +0200 Subject: Update windows.yml --- .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 551ef2bb38a..e33b97e0963 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -111,7 +111,7 @@ jobs: echo "ipv6=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features echo "xerces3=1" | out-file -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features echo "ssl=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features - echo "openssl=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features + echo "openssl11=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features echo "versioned_namespace=1" | out-file -append -encoding ASCII ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features shell: pwsh - name: Add optional features ${{ matrix.OptionalFeatures }} -- cgit v1.2.1 From a117a953486e1c9639b1b73780912a8ef3be87af Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sat, 22 Aug 2020 10:51:37 +0200 Subject: Make sure each configuration has its own cache * .github/workflows/windows.yml: --- .github/workflows/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 551ef2bb38a..14d8b45dec2 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -102,6 +102,7 @@ jobs: vcpkgGitCommitId: f6948aeb686c015d7b582aa4d76702a2f92602b1 vcpkgArguments: --recurse ${{ matrix.vcpkgpackages }} vcpkgTriplet: ${{ matrix.vcpkgarch }} + appendedCacheKey: ${{ matrix.name }} - name: create $ACE_ROOT/ace/config.h run: | '#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h -- cgit v1.2.1 From 2e743e10ceb17abf3eeb02ed74bbe65839fff6b5 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sat, 22 Aug 2020 12:55:49 +0200 Subject: Fixed typo in comment * TAO/tests/AMI/run_test.pl: --- TAO/tests/AMI/run_test.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TAO/tests/AMI/run_test.pl b/TAO/tests/AMI/run_test.pl index 13f9a99095c..884119168eb 100755 --- a/TAO/tests/AMI/run_test.pl +++ b/TAO/tests/AMI/run_test.pl @@ -63,7 +63,7 @@ if ($client->PutFile ($iorbase) == -1) { $SV->Kill (); $SV->TimedWait (1); exit 1; } -# copy the configruation file. +# copy the configuration file. if ($client->PutFile ($conf_file) == -1) { print STDERR "ERROR: cannot set file <$client_conf>\n"; $SV->Kill (); $SV->TimedWait (1); -- cgit v1.2.1 From df2ef7f25ec3ee3daff827e484c941c545007530 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sat, 22 Aug 2020 12:56:33 +0200 Subject: Don't run github linux/macosx workflows on push, just on pull request * .github/workflows/linux.yml: * .github/workflows/macosx.yml: --- .github/workflows/linux.yml | 1 - .github/workflows/macosx.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index d1bca0dcc75..743f0a2a9a7 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -1,7 +1,6 @@ name: linux on: - push: pull_request: schedule: - cron: '0 7 * * SUN' diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml index 4783557d2ad..0f4e24f9ee7 100644 --- a/.github/workflows/macosx.yml +++ b/.github/workflows/macosx.yml @@ -1,7 +1,6 @@ name: macosx on: - push: pull_request: schedule: - cron: '0 7 * * SUN' -- cgit v1.2.1 From c309609f9a052e35ae7977ae6f08e5d7a5c7a845 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sat, 22 Aug 2020 12:57:03 +0200 Subject: Do run on push * .github/workflows/linux.yml: * .github/workflows/macosx.yml: --- .github/workflows/linux.yml | 1 + .github/workflows/macosx.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 743f0a2a9a7..d1bca0dcc75 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -1,6 +1,7 @@ name: linux on: + push: pull_request: schedule: - cron: '0 7 * * SUN' diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml index 0f4e24f9ee7..4783557d2ad 100644 --- a/.github/workflows/macosx.yml +++ b/.github/workflows/macosx.yml @@ -1,6 +1,7 @@ name: macosx on: + push: pull_request: schedule: - cron: '0 7 * * SUN' -- cgit v1.2.1 From 69d236085b3493ec61ef3a092b9cfe7585629c66 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sat, 22 Aug 2020 15:37:33 +0200 Subject: Windows only on pull request * .github/workflows/windows.yml: * TAO/examples/Simple/Simple_util.h: --- .github/workflows/windows.yml | 1 - TAO/examples/Simple/Simple_util.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2beeca00bcf..9e43a5802c8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -1,7 +1,6 @@ name: windows on: - push: pull_request: schedule: - cron: '0 7 * * SUN' diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h index 005f514c9b0..b2df4e6925a 100644 --- a/TAO/examples/Simple/Simple_util.h +++ b/TAO/examples/Simple/Simple_util.h @@ -28,7 +28,7 @@ * A template server definition. This template can be used by * single server/client projects for definition of their * server/clients. See the directories time, bank, echo for - * further details of implemenatation. + * further details of implementation. */ template class Server -- cgit v1.2.1 From b31ce3388763ffbdfc7ca67e086e356c6377caef Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 11:03:34 +0200 Subject: Use msbuild v1 as version * .github/workflows/windows.yml: --- .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 9e43a5802c8..f64a7ac0b96 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -128,7 +128,7 @@ jobs: perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:ACE_ROOT}/tests/tests.mwc -workers 4 shell: pwsh - name: Setup msbuild - uses: microsoft/setup-msbuild@v1.0.1 + uses: microsoft/setup-msbuild@v1 - name: Build solution TAO/TAO_ACE.sln run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} TAO/TAO_ACE.sln - name: Build solution ACE/tests/tests.sln -- cgit v1.2.1 From 548012c88c8a3dfdd66d5c9323c07b80b0039250 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 24 Aug 2020 11:22:02 +0200 Subject: We need v1.0.1 * .github/workflows/windows.yml: --- .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 f64a7ac0b96..9e43a5802c8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -128,7 +128,7 @@ jobs: perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:ACE_ROOT}/tests/tests.mwc -workers 4 shell: pwsh - name: Setup msbuild - uses: microsoft/setup-msbuild@v1 + uses: microsoft/setup-msbuild@v1.0.1 - name: Build solution TAO/TAO_ACE.sln run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} TAO/TAO_ACE.sln - name: Build solution ACE/tests/tests.sln -- cgit v1.2.1