diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/fuzz.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/macosx.yml | 20 | ||||
| -rw-r--r-- | .github/workflows/windows.yml | 24 |
3 files changed, 15 insertions, 37 deletions
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml index f500c591..7be86477 100644 --- a/.github/workflows/fuzz.yml +++ b/.github/workflows/fuzz.yml @@ -17,9 +17,11 @@ jobs: steps: - name: checkout MPC uses: actions/checkout@v2 - - name: git clone dependent repositories - run: | - git clone --depth 1 git://github.com/DOCGroup/ACE_TAO.git $DOC_ROOT + - name: checkout ACE_TAO + uses: actions/checkout@v2 + with: + repository: DOCGroup/ACE_TAO + path: ${{ env.DOC_ROOT }} - name: Run fuzz run: | perl ${env:ACE_ROOT}/bin/fuzz.pl diff --git a/.github/workflows/macosx.yml b/.github/workflows/macosx.yml index 754755e0..1de35d04 100644 --- a/.github/workflows/macosx.yml +++ b/.github/workflows/macosx.yml @@ -20,8 +20,6 @@ jobs: ACE_ROOT: ${{ github.workspace }}/ACE_TAO/ACE TAO_ROOT: ${{ github.workspace }}/ACE_TAO/TAO MPC_ROOT: ${{ github.workspace }}/ - CIAO_ROOT: ${{ github.workspace }}/CIAO - DANCE_ROOT: ${{ github.workspace }}/DAnCE steps: - name: checkout MPC uses: actions/checkout@v2 @@ -30,16 +28,6 @@ jobs: with: repository: DOCGroup/ACE_TAO path: ${{ env.DOC_ROOT }} - - name: checkout CIAO - uses: actions/checkout@v2 - with: - repository: DOCGroup/CIAO - path: ${{ env.CIAO_ROOT }} - - name: checkout DAnCE - uses: actions/checkout@v2 - with: - repository: DOCGroup/DAnCE - path: ${{ env.DANCE_ROOT }} - name: create $ACE_ROOT/ace/config.h run: | '#include "ace/config-macosx.h"' > ${env:ACE_ROOT}/ace/config.h @@ -53,11 +41,11 @@ jobs: 'ipv6=1' > ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features 'versioned_namespace=1' >> ${env:ACE_ROOT}/bin/MakeProjectCreator/config/default.features shell: pwsh - - name: Run mwc.pl on $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc + - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc run: | - perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:CIAO_ROOT}/CIAO_TAO_DAnCE.mwc -workers 4 + perl ${env:ACE_ROOT}/bin/mwc.pl -type gnuace ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4 shell: pwsh - - name: Build CIAO_TAO_DAnCE project + - name: Build TAO_ACE project run: | - make -j 6 -C ${env:CIAO_ROOT} + make -j 6 -C ${env:TAO_ROOT} shell: pwsh diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 79f711f8..1c0e091c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -42,8 +42,6 @@ jobs: ACE_ROOT: ${{ github.workspace }}/ACE_TAO/ACE TAO_ROOT: ${{ github.workspace }}/ACE_TAO/TAO MPC_ROOT: ${{ github.workspace }}/ - CIAO_ROOT: ${{ github.workspace }}/CIAO - DANCE_ROOT: ${{ github.workspace }}/DAnCE VCPKG_ROOT: ${{ github.workspace }}/vcpkg XERCESC_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include XERCESC_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }} @@ -57,20 +55,10 @@ jobs: with: repository: DOCGroup/ACE_TAO path: ${{ env.DOC_ROOT }} - - name: checkout CIAO - uses: actions/checkout@v2 - with: - repository: DOCGroup/CIAO - path: ${{ env.CIAO_ROOT }} - - name: checkout DAnCE - uses: actions/checkout@v2 - with: - repository: DOCGroup/DAnCE - path: ${{ env.DANCE_ROOT }} - name: Install vcpkg - uses: lukka/run-vcpkg@v4 + uses: lukka/run-vcpkg@v5 with: - vcpkgGitCommitId: 56fffbe49dfb4dd8fae0940f272c5fd2b86be991 + vcpkgGitCommitId: 0bf3923f9fab4001c00f0f429682a0853b5749e0 vcpkgArguments: --recurse ${{ matrix.vcpkgpackages }} vcpkgTriplet: ${{ matrix.vcpkgarch }} appendedCacheKey: ${{ matrix.name }} @@ -91,13 +79,13 @@ jobs: 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 $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc + - name: Run mwc.pl on $(TAO_ROOT)/TAO_ACE.mwc run: | - perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:CIAO_ROOT}/CIAO_TAO_DAnCE.mwc -workers 4 + perl ${env:ACE_ROOT}/bin/mwc.pl -type ${{ matrix.mpctype }} ${env:TAO_ROOT}/TAO_ACE.mwc -workers 4 shell: pwsh - name: Setup msbuild uses: microsoft/setup-msbuild@v1 - - name: Build solution $(CIAO_ROOT)/CIAO_TAO_DAnCE.sln + - name: Build solution $(TAO_ROOT)/TAO_ACE.sln run: | - msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} ${env:CIAO_ROOT}/CIAO_TAO_DAnCE.sln + msbuild -maxcpucount -p:Platform=${{ matrix.BuildPlatform }} -p:Configuration=${{ matrix.BuildConfiguration }} ${env:TAO_ROOT}/TAO_ACE.sln shell: pwsh |