diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-08-26 08:22:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-26 08:22:22 +0200 |
commit | 2f35a199f9d5c6074e8f6450c3973ea6a10af5ff (patch) | |
tree | 31930878ed228405ce05d6c4701c954a5a224a45 | |
parent | 9c8bbd22dac7fc7b6fee9d210af8e5e7ba03c062 (diff) | |
parent | 548012c88c8a3dfdd66d5c9323c07b80b0039250 (diff) | |
download | ATCD-2f35a199f9d5c6074e8f6450c3973ea6a10af5ff.tar.gz |
Merge pull request #1214 from jwillemsen/jwi-githubactionwindows
Replace azure pipelines with github actions for CI testing on Windows
-rw-r--r-- | .github/workflows/windows.yml | 135 | ||||
-rw-r--r-- | README.md | 6 | ||||
-rw-r--r-- | TAO/examples/Simple/Simple_util.h | 2 | ||||
-rwxr-xr-x | TAO/tests/AMI/run_test.pl | 2 | ||||
-rw-r--r-- | azure-pipelines.yml | 137 |
5 files changed, 142 insertions, 140 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 00000000000..9e43a5802c8 --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,135 @@ +name: windows + +on: + 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 }}/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 + - name: checkout MPC + uses: actions/checkout@v2 + with: + repository: DOCGroup/MPC + path: MPC + - name: Install vcpkg + uses: lukka/run-vcpkg@v3 + with: + 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 + 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 "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 }} + 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 + 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: Setup msbuild + 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 + run: msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} ACE/tests/tests.sln diff --git a/README.md b/README.md index 6cae93f9649..bc8ddd192af 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/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) -[![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/) 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 Servant> class Server 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); 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 |