From 333a858aab90f65bbbf0b4880da389f53cb71e9d Mon Sep 17 00:00:00 2001 From: gabrieldemarmiesse Date: Fri, 21 Feb 2020 21:32:58 +0000 Subject: [PATCH] Group windows tests together. --- .github/workflows/ci_test.yml | 6 +----- .github/workflows/release.yml | 6 +----- .github/workflows/windows_nightly.yml | 6 +----- tools/run_cpu_tests_windows.sh | 5 +++++ 4 files changed, 8 insertions(+), 15 deletions(-) create mode 100644 tools/run_cpu_tests_windows.sh diff --git a/.github/workflows/ci_test.yml b/.github/workflows/ci_test.yml index b04543ea2c..b1b50496c0 100644 --- a/.github/workflows/ci_test.yml +++ b/.github/workflows/ci_test.yml @@ -54,11 +54,7 @@ jobs: env: BAZEL_VC: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/" shell: bash - run: | - python -m pip install wheel setuptools - curl -sSOL https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-windows-x86_64.exe - export BAZEL_PATH=/d/a/addons/addons/bazel-${BAZEL_VERSION}-windows-x86_64.exe - bash -x -e ./tools/ci_testing/addons_cpu.sh + run: bash tools/run_cpu_tests_windows.sh flake8-test: name: Flake8 runs-on: ubuntu-latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a7cb41df36..9bffc9f02a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,11 +52,7 @@ jobs: env: BAZEL_VC: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/" shell: bash - run: | - python -m pip install wheel setuptools - curl -sSOL https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-windows-x86_64.exe - export BAZEL_PATH=/d/a/addons/addons/bazel-${BAZEL_VERSION}-windows-x86_64.exe - bash -x -e ./tools/ci_testing/addons_cpu.sh + run: bash tools/run_cpu_tests_windows.sh manylinux-release-wheel: name: Build release wheels for manylinux2010 diff --git a/.github/workflows/windows_nightly.yml b/.github/workflows/windows_nightly.yml index 86511f2e1c..352042e759 100644 --- a/.github/workflows/windows_nightly.yml +++ b/.github/workflows/windows_nightly.yml @@ -23,11 +23,7 @@ jobs: env: BAZEL_VC: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/" shell: bash - run: | - python -m pip install wheel setuptools - curl -sSOL https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-windows-x86_64.exe - export BAZEL_PATH=/d/a/addons/addons/bazel-${BAZEL_VERSION}-windows-x86_64.exe - bash -x -e ./tools/ci_testing/addons_cpu.sh + run: bash tools/run_cpu_tests_windows.sh windows-nightly-wheel: name: Build nightly wheels for Windows diff --git a/tools/run_cpu_tests_windows.sh b/tools/run_cpu_tests_windows.sh new file mode 100644 index 0000000000..55ef19b543 --- /dev/null +++ b/tools/run_cpu_tests_windows.sh @@ -0,0 +1,5 @@ +set -e -x +python -m pip install wheel setuptools +curl -sSOL https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-windows-x86_64.exe +export BAZEL_PATH=/d/a/addons/addons/bazel-${BAZEL_VERSION}-windows-x86_64.exe +bash ./tools/ci_testing/addons_cpu.sh