diff --git a/.github/workflows/choose_branch.yaml b/.github/workflows/choose_branch.yaml index 3fad6756c..f1db46067 100644 --- a/.github/workflows/choose_branch.yaml +++ b/.github/workflows/choose_branch.yaml @@ -48,11 +48,6 @@ jobs: SIRE_SILENT_PHONEHOME: 1 REPO: "${{ github.repository }}" steps: - # Need to install and use VS 2017 for conda-compliant builds - - name: Set up Visual Studio 2017 Build Tools (required for Python modules) - run: | - choco install visualstudio2017-workload-vctools - if: matrix.platform.name == 'windows' # - uses: conda-incubator/setup-miniconda@v2 with: @@ -62,6 +57,11 @@ jobs: miniforge-version: latest miniforge-variant: Mambaforge use-mamba: true + # Need to install and use VS 2017 for conda-compliant builds + - name: Set up Visual Studio 2017 Build Tools (required for Python modules) + run: | + mamba install -y -c conda-forge vs2017_win-64 + if: matrix.platform.name == 'windows' # - name: Clone the desired branch run: git clone https://github.com/${{ env.REPO }} -b ${{ github.event.inputs.branch }} sire diff --git a/.github/workflows/devel.yaml b/.github/workflows/devel.yaml index a702e1bb0..f1f13e3b6 100644 --- a/.github/workflows/devel.yaml +++ b/.github/workflows/devel.yaml @@ -46,11 +46,6 @@ jobs: SIRE_SILENT_PHONEHOME: 1 REPO: "${{ github.repository }}" steps: - # Need to install and use VS 2017 for conda-compliant builds - - name: Set up Visual Studio 2017 Build Tools (required for Python modules) - run: | - choco install visualstudio2017-workload-vctools - if: matrix.platform.name == 'windows' # - uses: conda-incubator/setup-miniconda@v2 with: @@ -60,6 +55,11 @@ jobs: miniforge-version: latest miniforge-variant: Mambaforge use-mamba: true + # Need to install and use VS 2017 for conda-compliant builds + - name: Set up Visual Studio 2017 Build Tools (required for Python modules) + run: | + mamba install -y -c conda-forge vs2017_win-64 + if: matrix.platform.name == 'windows' # - name: Clone the devel branch (push to devel) run: git clone https://github.com/${{ env.REPO }} sire diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 258c259ff..c1e86d7b6 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -39,11 +39,6 @@ jobs: SIRE_SILENT_PHONEHOME: 1 REPO: "${{ github.event.pull_request.head.repo.full_name || github.repository }}" steps: - # Need to install and use VS 2017 for conda-compliant builds - - name: Set up Visual Studio 2017 Build Tools (required for Python modules) - run: | - choco install visualstudio2017-workload-vctools - if: matrix.platform.name == 'windows' # - uses: conda-incubator/setup-miniconda@v2 with: @@ -53,6 +48,11 @@ jobs: miniforge-version: latest miniforge-variant: Mambaforge use-mamba: true + # Need to install and use VS 2017 for conda-compliant builds + - name: Set up Visual Studio 2017 Build Tools (required for Python modules) + run: | + mamba install -y -c conda-forge vs2017_win-64 + if: matrix.platform.name == 'windows' # - name: Clone the main branch (push to main) run: git clone -b main https://github.com/openbiosim/sire sire diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 7ecf06e54..af0952632 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -45,11 +45,6 @@ jobs: SIRE_SILENT_PHONEHOME: 1 REPO: "${{ github.event.pull_request.head.repo.full_name || github.repository }}" steps: - # Need to install and use VS 2017 for conda-compliant builds - - name: Set up Visual Studio 2017 Build Tools (required for Python modules) - run: | - choco install visualstudio2017-workload-vctools - if: matrix.platform.name == 'windows' # - uses: conda-incubator/setup-miniconda@v2 with: @@ -59,6 +54,11 @@ jobs: miniforge-version: latest miniforge-variant: Mambaforge use-mamba: true + # Need to install and use VS 2017 for conda-compliant builds + - name: Set up Visual Studio 2017 Build Tools (required for Python modules) + run: | + mamba install -y -c conda-forge vs2017_win-64 + if: matrix.platform.name == 'windows' # - name: Clone the feature branch (pull request to devel) run: git clone -b ${{ github.head_ref }} --single-branch https://github.com/${{ env.REPO }} sire