Skip to content

Commit c86176b

Browse files
authored
ci: Temporarily minimize testing matrix (#799)
1 parent 2bd9263 commit c86176b

File tree

2 files changed

+3
-115
lines changed

2 files changed

+3
-115
lines changed

.github/workflows/integrate.yml

+2-55
Original file line numberDiff line numberDiff line change
@@ -10,65 +10,12 @@ env:
1010
FORCE_COLOR: 1
1111

1212
jobs:
13-
windowsNode14:
14-
name: '[Windows] Node.js v14: Unit tests'
15-
runs-on: windows-latest
16-
strategy:
17-
matrix:
18-
sls-version: [2, 3]
19-
pipenv-version: ['2022.8.5', '2022.8.13']
20-
steps:
21-
- name: Checkout repository
22-
uses: actions/checkout@v2
23-
24-
- name: Retrieve dependencies from cache
25-
id: cacheNpm
26-
uses: actions/cache@v2
27-
with:
28-
path: |
29-
~/.npm
30-
node_modules
31-
key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
32-
restore-keys: npm-v14-${{ runner.os }}-${{ github.ref }}-
33-
34-
- name: Set up Python 3.7
35-
uses: actions/setup-python@v2
36-
with:
37-
python-version: 3.7
38-
39-
- name: Install Node.js and npm
40-
uses: actions/setup-node@v1
41-
with:
42-
node-version: 14.x
43-
44-
- name: Check python version
45-
run: |
46-
python --version
47-
48-
- name: Install setuptools
49-
run: python -m pip install --force setuptools wheel
50-
51-
- name: Install pipenv / poetry
52-
run: python -m pip install pipenv==${{ matrix.pipenv-version }} poetry
53-
54-
- name: Install serverless
55-
run: npm install -g serverless@${{ matrix.sls-version }}
56-
57-
- name: Install dependencies
58-
if: steps.cacheNpm.outputs.cache-hit != 'true'
59-
run: |
60-
npm update --no-save
61-
npm update --save-dev --no-save
62-
- name: Unit tests
63-
run: npm test
64-
6513
linuxNode14:
6614
name: '[Linux] Node.js 14: Unit tests'
6715
runs-on: ubuntu-latest
6816
strategy:
6917
matrix:
7018
sls-version: [2, 3]
71-
pipenv-version: ['2022.8.5', '2022.8.13']
7219
steps:
7320
- name: Checkout repository
7421
uses: actions/checkout@v2
@@ -101,7 +48,7 @@ jobs:
10148
run: python -m pip install --force setuptools wheel
10249

10350
- name: Install pipenv / poetry
104-
run: python -m pip install pipenv==${{ matrix.pipenv-version }} poetry
51+
run: python -m pip install pipenv poetry
10552

10653
- name: Install serverless
10754
run: npm install -g serverless@${{ matrix.sls-version }}
@@ -117,7 +64,7 @@ jobs:
11764
tagIfNewVersion:
11865
name: Tag if new version
11966
runs-on: ubuntu-latest
120-
needs: [windowsNode14, linuxNode14]
67+
needs: [linuxNode14]
12168
steps:
12269
- name: Checkout repository
12370
uses: actions/checkout@v2

.github/workflows/validate.yml

+1-60
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ jobs:
1616
strategy:
1717
matrix:
1818
sls-version: [2, 3]
19-
pipenv-version: ['2022.8.5', '2022.8.13', '2023.7.4', '2023.7.9']
20-
# pipenv 2202.8.13 marks deprecation of pipenv lock --requirements
21-
# https://github.com/pypa/pipenv/blob/30067b458bd7a429f242736b7fde40c9bd4d4f14/CHANGELOG.rst#2022813-2022-08-13
22-
# pipenv 2023.7.9 marks deprecation of pipenv lock --keep-outdated
23-
# https://github.com/pypa/pipenv/blob/30067b458bd7a429f242736b7fde40c9bd4d4f14/CHANGELOG.rst#202379-2023-07-09
2419
steps:
2520
- name: Checkout repository
2621
uses: actions/checkout@v2
@@ -66,7 +61,7 @@ jobs:
6661
run: python -m pip install --force setuptools wheel
6762

6863
- name: Install pipenv / poetry
69-
run: python -m pip install pipenv==${{ matrix.pipenv-version }} poetry
64+
run: python -m pip install pipenv poetry
7065

7166
- name: Install serverless
7267
run: npm install -g serverless@${{ matrix.sls-version }}
@@ -92,57 +87,3 @@ jobs:
9287
fi
9388
- name: Unit tests
9489
run: npm test
95-
96-
windowsNode14:
97-
name: '[Windows] Node.js v14: Unit tests'
98-
runs-on: windows-latest
99-
strategy:
100-
matrix:
101-
sls-version: [2, 3]
102-
pipenv-version: ['2022.8.5', '2022.8.13', '2023.7.4', '2023.7.9']
103-
steps:
104-
- name: Checkout repository
105-
uses: actions/checkout@v2
106-
107-
- name: Retrieve dependencies from cache
108-
id: cacheNpm
109-
uses: actions/cache@v2
110-
with:
111-
path: |
112-
~/.npm
113-
node_modules
114-
key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
115-
restore-keys: |
116-
npm-v14-${{ runner.os }}-${{ github.ref }}-
117-
npm-v14-${{ runner.os }}-refs/heads/master-
118-
119-
- name: Set up Python 3.7
120-
uses: actions/setup-python@v2
121-
with:
122-
python-version: 3.7
123-
124-
- name: Install Node.js and npm
125-
uses: actions/setup-node@v1
126-
with:
127-
node-version: 14.x
128-
129-
- name: Check python version
130-
run: |
131-
python --version
132-
133-
- name: Install setuptools
134-
run: python -m pip install --force setuptools wheel
135-
136-
- name: Install pipenv / poetry
137-
run: python -m pip install pipenv==${{ matrix.pipenv-version }} poetry
138-
139-
- name: Install serverless
140-
run: npm install -g serverless@${{ matrix.sls-version }}
141-
142-
- name: Install dependencies
143-
if: steps.cacheNpm.outputs.cache-hit != 'true'
144-
run: |
145-
npm update --no-save
146-
npm update --save-dev --no-save
147-
- name: Unit tests
148-
run: npm test

0 commit comments

Comments
 (0)