Skip to content

Commit 9f46010

Browse files
WindQAQseanpmorgan
authored andcommitted
Switch windows shell to bash (#910)
* BLD: switch windows shell to bash * BLD: change python version
1 parent ccdc4b0 commit 9f46010

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

.github/workflows/ci_test.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,21 @@ jobs:
4242
runs-on: windows-latest
4343
strategy:
4444
matrix:
45-
python-version: ['3.7.5']
45+
python-version: ['3.7']
4646
steps:
4747
- uses: actions/checkout@v1
48-
- uses: numworks/setup-msys2@v1
4948
- uses: actions/setup-python@v1
5049
with:
5150
python-version: ${{ matrix.python-version }}
5251
- name: CI test windows py${{ matrix.python-version }}
53-
shell: cmd
52+
shell: bash
5453
run: |
5554
python -m pip install wheel setuptools
56-
curl -sSOL https://github.com/bazelbuild/bazel/releases/download/%BAZEL_VERSION%/bazel-%BAZEL_VERSION%-windows-x86_64.exe
57-
echo export BAZEL_VC=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Enterprise/VC/ >>D:\a\_temp\msys\msys64\home\runneradmin\.bash_profile
58-
echo export BAZEL_PATH=/d/a/addons/addons/bazel-%BAZEL_VERSION%-windows-x86_64.exe >>D:\a\_temp\msys\msys64\home\runneradmin\.bash_profile
59-
echo export PATH=/c/hostedtoolcache/windows/Python/${{ matrix.python-version }}/x64/:$PATH >>D:\a\_temp\msys\msys64\home\runneradmin\.bash_profile
60-
msys2do ./tools/ci_testing/addons_cpu.sh
55+
curl -sSOL https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-windows-x86_64.exe
56+
export BAZEL_VC=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Enterprise/VC/
57+
export BAZEL_PATH=/d/a/addons/addons/bazel-${BAZEL_VERSION}-windows-x86_64.exe
58+
export PATH=/c/hostedtoolcache/windows/Python/${{ matrix.python-version }}/x64/:$PATH
59+
bash -x -e ./tools/ci_testing/addons_cpu.sh
6160
sanity-check:
6261
name: Sanity Check
6362
runs-on: ubuntu-18.04

.github/workflows/windows_nightly.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,18 @@ jobs:
1313
runs-on: windows-latest
1414
strategy:
1515
matrix:
16-
python-version: ['3.7.5']
16+
python-version: ['3.7']
1717
steps:
1818
- uses: actions/checkout@v1
19-
- uses: numworks/setup-msys2@v1
2019
- uses: actions/setup-python@v1
2120
with:
2221
python-version: ${{ matrix.python-version }}
2322
- name: Nightly test Windows py${{ matrix.python-version }}
24-
shell: cmd
23+
shell: bash
2524
run: |
2625
python -m pip install wheel setuptools
27-
curl -sSOL https://github.com/bazelbuild/bazel/releases/download/%BAZEL_VERSION%/bazel-%BAZEL_VERSION%-windows-x86_64.exe
28-
echo export BAZEL_VC=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Enterprise/VC/ >>D:\a\_temp\msys\msys64\home\runneradmin\.bash_profile
29-
echo export BAZEL_PATH=/d/a/addons/addons/bazel-%BAZEL_VERSION%-windows-x86_64.exe >>D:\a\_temp\msys\msys64\home\runneradmin\.bash_profile
30-
echo export PATH=/c/hostedtoolcache/windows/Python/${{ matrix.python-version }}/x64/:$PATH >>D:\a\_temp\msys\msys64\home\runneradmin\.bash_profile
31-
msys2do ./tools/ci_testing/addons_cpu.sh
26+
curl -sSOL https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-windows-x86_64.exe
27+
export BAZEL_VC=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Enterprise/VC/
28+
export BAZEL_PATH=/d/a/addons/addons/bazel-${BAZEL_VERSION}-windows-x86_64.exe
29+
export PATH=/c/hostedtoolcache/windows/Python/${{ matrix.python-version }}/x64/:$PATH
30+
bash -x -e ./tools/ci_testing/addons_cpu.sh

0 commit comments

Comments
 (0)