diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-02 12:37:20 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-02 12:37:20 +0100 |
| commit | 3416303d2e041adc23383ef4d166be363d22b044 (patch) | |
| tree | c02c2996cac0048c5b8b406e6b20863a9f3bff8b /.github | |
| parent | 7ea76605d51de9c9dd8379d28bad420e6cf42ef7 (diff) | |
| download | ATCD-3416303d2e041adc23383ef4d166be363d22b044.tar.gz | |
pacman must use msys shell
* .github/workflows/windows.yml:
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/windows.yml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6d57d462dee..d99f9dfd9ff 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -148,25 +148,28 @@ jobs: TAO_ROOT: ${{ github.workspace }}/TAO MPC_ROOT: ${{ github.workspace }}/MPC steps: - - uses: actions/checkout@v2 + - name: checkout ACE/TAO + uses: actions/checkout@v2 + - name: checkout MPC + uses: actions/checkout@v2 + with: + repository: DOCGroup/MPC + path: ${{ env.MPC_ROOT }} - uses: msys2/setup-msys2@v2 with: msystem: ${{ matrix.msystem }} install: make - run: pacman --noconfirm -S gcc + shell: msys2 {0} if: ${{ matrix.compiler == 'gcc' }} - run: pacman --noconfirm -S mingw-w64-x86_64-clang + shell: msys2 {0} if: ${{ (matrix.msystem == 'MINGW64') && (matrix.compiler == 'clang') }} - run: pacman --noconfirm -S mingw-w64-i686-clang + shell: msys2 {0} if: ${{ (matrix.msystem == 'MINGW32') && (matrix.compiler == 'clang') }} - run: ${{ matrix.compiler }} --version - - name: checkout ACE/TAO - uses: actions/checkout@v2 - - name: checkout MPC - uses: actions/checkout@v2 - with: - repository: DOCGroup/MPC - path: ${{ env.MPC_ROOT }} + shell: msys2 {0} - name: create $ACE_ROOT/ace/config.h run: | '#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h |