Skip to content

Commit 84aeb9a

Browse files
alan-agius4Keen Yee Liau
authored andcommitted
ci: update windows image to avoid using choco
1 parent 57d226a commit 84aeb9a

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

.circleci/config.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,12 @@ executors:
6161
resource_class: windows.medium
6262
shell: powershell.exe -ExecutionPolicy Bypass
6363
machine:
64-
image: windows-server-2019
64+
# Windows preview image that includes the following:
65+
# - Visual Studio 2019 build tools
66+
# - Node 12
67+
# - yarn 1.17
68+
# - Python 3 3.7.4
69+
image: windows-server-2019-vs2019:201908-02
6570

6671
# Command Definitions
6772
# https://circleci.com/docs/2.0/reusing-config/#authoring-reusable-commands
@@ -76,7 +81,7 @@ commands:
7681
- run:
7782
# Need to install node and yarn before to ensure correct versions.
7883
name: Setup windows node environment
79-
command: ./.circleci/windows-env.ps1
84+
command: ./.circleci/windows-env.ps1
8085
- run: node --version
8186
- run: yarn --version
8287

@@ -298,7 +303,7 @@ jobs:
298303
executor: windows-executor
299304
steps:
300305
- custom_attach_workspace
301-
- setup_windows
306+
- setup_windows
302307
- restore_cache:
303308
keys:
304309
- *cache_key_win
@@ -315,7 +320,7 @@ jobs:
315320
- persist_to_workspace:
316321
root: *workspace_location
317322
paths:
318-
- ./*
323+
- ./*
319324

320325
test-win:
321326
executor: windows-executor
@@ -416,7 +421,7 @@ workflows:
416421
- build
417422
- flake-jail:
418423
requires:
419-
- build
424+
- build
420425

421426
# Windows jobs
422427
# These jobs only run after their non-windows counterparts finish successfully.

.circleci/windows-env.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Install nodejs and yarn via Chocolatey.
2-
choco install nodejs --version 12.1.0 --no-progress
3-
choco install yarn --version 1.17.3 --no-progress
2+
# choco install nodejs --version 12.1.0 --no-progress
3+
# choco install yarn --version 1.17.3 --no-progress
44

55
# Add PATH modifications to the Powershell profile. This is the win equivalent of .bash_profile.
66
# https://docs.microsoft.com/en-us/previous-versions//bb613488(v=vs.85)

0 commit comments

Comments
 (0)