diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-08-21 12:57:51 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-08-21 21:04:52 +0200 |
| commit | 7eac7289b4d042d6d76a2999fc6fa6cda764715a (patch) | |
| tree | 5e881b372d0e6d1cfce3b5549b8286addbd2e3d3 | |
| parent | 4df89322a126f6a01fd3401d924aa22c8b4ca239 (diff) | |
| download | ATCD-7eac7289b4d042d6d76a2999fc6fa6cda764715a.tar.gz | |
More tweaks
* .github/workflows/windows.yml:
| -rw-r--r-- | .github/workflows/windows.yml | 28 |
1 files 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 |