Skip to content

Commit d62a30e

Browse files
ianhattendorfianhattendorf
authored
Merge pull request #1897 from julianmesa-gitkraken/update-windows-ci-actions
Update windows 2016 CI to 2019
2 parents 09b30eb + 0f897b2 commit d62a30e

3 files changed

Lines changed: 9009 additions & 433 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,24 @@ jobs:
2020
steps:
2121
- name: Install Dependencies for Ubuntu
2222
# git >= 2.18 required for actions/checkout git support
23-
run: apt-get update && apt-get install -y software-properties-common && add-apt-repository -y ppa:git-core/ppa && apt-get update && apt-get install -y git build-essential clang python3 libssl-dev libkrb5-dev libc++-dev
23+
run: apt-get update && apt-get install -y software-properties-common && add-apt-repository -y ppa:git-core/ppa && apt-get update && apt-get install -y git build-essential clang libssl-dev libkrb5-dev libc++-dev wget
2424
env:
2525
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
2626

27+
- name: Setup python 3.6
28+
env:
29+
CC: clang
30+
CXX: clang++
31+
run: |
32+
mkdir ~/python
33+
cd ~/python
34+
wget https://www.python.org/ftp/python/3.6.15/Python-3.6.15.tgz
35+
tar -xvf Python-3.6.15.tgz
36+
cd Python-3.6.15
37+
./configure
38+
make
39+
make install
40+
2741
- name: Setup Environment
2842
run: |
2943
mkdir ~/.ssh_tests
@@ -70,10 +84,10 @@ jobs:
7084
if: startsWith(github.ref, 'refs/tags/v')
7185
env:
7286
node_pre_gyp_bucket: ${{ secrets.node_pre_gyp_bucket }}
73-
node_pre_gyp_accessKeyId: ${{ secrets.node_pre_gyp_accessKeyId }}
74-
node_pre_gyp_secretAccessKey: ${{ secrets.node_pre_gyp_secretAccessKey }}
87+
AWS_ACCESS_KEY_ID: ${{ secrets.node_pre_gyp_accessKeyId }}
88+
AWS_SECRET_ACCESS_KEY: ${{ secrets.node_pre_gyp_secretAccessKey }}
7589
run: |
76-
npm install -g node-pre-gyp aws-sdk
90+
npm install -g @mapbox/node-pre-gyp aws-sdk
7791
node lifecycleScripts/clean
7892
node-pre-gyp package
7993
node-pre-gyp publish
@@ -128,10 +142,10 @@ jobs:
128142
if: startsWith(github.ref, 'refs/tags/v')
129143
env:
130144
node_pre_gyp_bucket: ${{ secrets.node_pre_gyp_bucket }}
131-
node_pre_gyp_accessKeyId: ${{ secrets.node_pre_gyp_accessKeyId }}
132-
node_pre_gyp_secretAccessKey: ${{ secrets.node_pre_gyp_secretAccessKey }}
145+
AWS_ACCESS_KEY_ID: ${{ secrets.node_pre_gyp_accessKeyId }}
146+
AWS_SECRET_ACCESS_KEY: ${{ secrets.node_pre_gyp_secretAccessKey }}
133147
run: |
134-
npm install -g node-pre-gyp aws-sdk
148+
npm install -g @mapbox/node-pre-gyp aws-sdk
135149
node lifecycleScripts/clean
136150
node-pre-gyp package
137151
node-pre-gyp publish
@@ -142,7 +156,7 @@ jobs:
142156
matrix:
143157
node: [12, 14, 16]
144158
arch: [x86, x64]
145-
runs-on: windows-2016
159+
runs-on: windows-2019
146160
steps:
147161
- name: Setup Environment
148162
run: |
@@ -178,7 +192,7 @@ jobs:
178192
# and it treats each additional step past the first as an orphaned process.
179193
- name: Deploy (Dependencies)
180194
if: startsWith(github.ref, 'refs/tags/v')
181-
run: npm install -g node-pre-gyp aws-sdk
195+
run: npm install -g @mapbox/node-pre-gyp aws-sdk
182196

183197
- name: Deploy (Clean)
184198
if: startsWith(github.ref, 'refs/tags/v')
@@ -192,6 +206,6 @@ jobs:
192206
if: startsWith(github.ref, 'refs/tags/v')
193207
env:
194208
node_pre_gyp_bucket: ${{ secrets.node_pre_gyp_bucket }}
195-
node_pre_gyp_accessKeyId: ${{ secrets.node_pre_gyp_accessKeyId }}
196-
node_pre_gyp_secretAccessKey: ${{ secrets.node_pre_gyp_secretAccessKey }}
209+
AWS_ACCESS_KEY_ID: ${{ secrets.node_pre_gyp_accessKeyId }}
210+
AWS_SECRET_ACCESS_KEY: ${{ secrets.node_pre_gyp_secretAccessKey }}
197211
run: node-pre-gyp publish

0 commit comments

Comments
 (0)