diff --git a/.github/workflows/api-test-lint-deploy.yaml b/.github/workflows/api-test-lint-deploy.yaml index 9ab57577d29..0039d94a998 100644 --- a/.github/workflows/api-test-lint-deploy.yaml +++ b/.github/workflows/api-test-lint-deploy.yaml @@ -57,7 +57,7 @@ jobs: needs: [lint] strategy: matrix: - os: ['windows-latest', 'ubuntu-18.04', 'macos-latest'] + os: ['windows-2019', 'ubuntu-18.04', 'macos-latest'] runs-on: '${{ matrix.os }}' steps: - uses: 'actions/checkout@v2' diff --git a/.github/workflows/app-test-build-deploy.yaml b/.github/workflows/app-test-build-deploy.yaml index 9e0e86d0eb1..12c9b957088 100644 --- a/.github/workflows/app-test-build-deploy.yaml +++ b/.github/workflows/app-test-build-deploy.yaml @@ -89,7 +89,7 @@ jobs: # to run cross-platform just like builds, might as well do them in the same job strategy: matrix: - os: ['windows-latest', 'ubuntu-18.04', 'macos-latest'] + os: ['windows-2019', 'ubuntu-18.04', 'macos-latest'] name: 'opentrons app backend unit tests and build' runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/shared-data-test-lint-deploy.yaml b/.github/workflows/shared-data-test-lint-deploy.yaml index 271ff39756f..0d9f17aa7d8 100644 --- a/.github/workflows/shared-data-test-lint-deploy.yaml +++ b/.github/workflows/shared-data-test-lint-deploy.yaml @@ -21,7 +21,6 @@ on: - 'shared-data/*/**' workflow_dispatch: - defaults: run: shell: bash @@ -45,14 +44,14 @@ jobs: project: 'shared-data/python' - name: Lint run: make -C shared-data/python lint - + python-test: name: 'shared-data package python tests' timeout-minutes: 20 needs: [python-lint] strategy: matrix: - os: ['windows-latest', 'ubuntu-18.04', 'macos-latest'] + os: ['windows-2019', 'ubuntu-18.04', 'macos-latest'] runs-on: '${{ matrix.os }}' steps: - uses: 'actions/checkout@v2' diff --git a/app-shell/Makefile b/app-shell/Makefile index 4a94a6a5355..d6e20929a21 100644 --- a/app-shell/Makefile +++ b/app-shell/Makefile @@ -112,8 +112,8 @@ dist-ubuntu-latest: dist-linux .PHONY: dist-ubuntu-18.04 dist-ubuntu-18.04: dist-linux -.PHONY: dist-windows-latest -dist-windows-latest: dist-win +.PHONY: dist-windows-2019 +dist-windows-2019: dist-win # copy distributable artifacts to the publish directory # update files will not exist for all OSs, so noop if cp errors