Skip to content

Commit 986001a

Browse files
committed
ci: fix
1 parent 9c8beb0 commit 986001a

File tree

2 files changed

+48
-46
lines changed

2 files changed

+48
-46
lines changed

.github/workflows/commitlint.yml

+24-22
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
11
on:
2-
pull_request:
3-
types: [synchronize, edited, opened]
2+
pull_request:
3+
types: [synchronize, edited, opened]
44

55
concurrency:
6-
group: ${{ github.workflow }}-${{ github.ref }}
7-
cancel-in-progress: true
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
88

99
jobs:
10-
lint:
11-
runs-on: ubuntu-latest
12-
steps:
13-
- uses: actions/checkout@v2
10+
lint:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v3
14+
with:
15+
fetch-depth: 0
1416

15-
- uses: actions/setup-node@v1
16-
with:
17-
node-version: 20.6.0
17+
- uses: actions/setup-node@v1
18+
with:
19+
node-version: 20.6.0
1820

19-
- name: npm install
20-
run: npm ci
21+
- name: npm install
22+
run: npm ci
2123

22-
- name: Lint commit messages
23-
run: npx commitlint --from $BASE_SHA --to $HEAD_SHA --verbose
24-
env:
25-
BASE_SHA: ${{ github.event.pull_request.base.sha }}
26-
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
24+
- name: Lint commit messages
25+
run: npx commitlint --from $BASE_SHA --to $HEAD_SHA --verbose
26+
env:
27+
BASE_SHA: ${{ github.event.pull_request.base.sha }}
28+
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
2729

28-
- name: Lint pull request title
29-
run: echo $PR_TITLE | npx commitlint --verbose
30-
env:
31-
PR_TITLE: ${{ github.event.pull_request.title }}
30+
- name: Lint pull request title
31+
run: echo $PR_TITLE | npx commitlint --verbose
32+
env:
33+
PR_TITLE: ${{ github.event.pull_request.title }}

.github/workflows/main.yml

+24-24
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ jobs:
1111
matrix:
1212
node-version: [20.6.0]
1313
services:
14-
storage-ftp:
15-
image: garethflowers/ftp-server:0.7.0
16-
env:
17-
FTP_USER: user
18-
FTP_PASS: '123'
19-
ports:
20-
- "20-21:20-21"
21-
- "40000-40009:40000-40009"
22-
storage-sftp:
23-
image: atmoz/sftp:alpine
24-
env:
25-
SFTP_USERS: user:123:::upload
26-
ports:
27-
- "2222:22"
14+
storage-ftp:
15+
image: garethflowers/ftp-server:0.7.0
16+
env:
17+
FTP_USER: user
18+
FTP_PASS: '123'
19+
ports:
20+
- '20-21:20-21'
21+
- '40000-40009:40000-40009'
22+
storage-sftp:
23+
image: atmoz/sftp:alpine
24+
env:
25+
SFTP_USERS: user:123:::upload
26+
ports:
27+
- '2222:22'
2828
steps:
2929
- uses: actions/checkout@v2
3030
- name: Use Node.js ${{ matrix.node-version }}
@@ -92,7 +92,7 @@ jobs:
9292
strategy:
9393
matrix:
9494
node-version: [20.6.0]
95-
postgres-version: [ 14 ]
95+
postgres-version: [14]
9696
services:
9797
postgres:
9898
image: postgres:${{ matrix.postgres-version }}
@@ -101,7 +101,7 @@ jobs:
101101
POSTGRES_PASSWORD: ''
102102
POSTGRES_HOST_AUTH_METHOD: trust
103103
ports:
104-
- "5432:5432"
104+
- '5432:5432'
105105
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
106106
steps:
107107
- uses: actions/checkout@v2
@@ -112,7 +112,7 @@ jobs:
112112
- name: Cache node_modules
113113
uses: actions/cache@v1
114114
with:
115-
path: "**/node_modules"
115+
path: '**/node_modules'
116116
key: ${{ runner.os }}-postgres-node_modules-${{ hashFiles('**/package-lock.json') }}
117117
- name: npm install
118118
run: npm ci
@@ -131,16 +131,16 @@ jobs:
131131
strategy:
132132
matrix:
133133
node-version: [20.6.0]
134-
mysql-version: [ 8.0 ]
134+
mysql-version: [8.0]
135135
services:
136136
mysql:
137-
image: "mysql:${{ matrix.mysql-version }}"
137+
image: 'mysql:${{ matrix.mysql-version }}'
138138
options: >-
139139
--health-cmd "mysqladmin ping --silent"
140140
-e MYSQL_ALLOW_EMPTY_PASSWORD=yes
141141
-e MYSQL_DATABASE=default
142142
ports:
143-
- "3306:3306"
143+
- '3306:3306'
144144
steps:
145145
- uses: actions/checkout@v2
146146
- name: Use Node.js ${{ matrix.node-version }}
@@ -150,7 +150,7 @@ jobs:
150150
- name: Cache node_modules
151151
uses: actions/cache@v1
152152
with:
153-
path: "**/node_modules"
153+
path: '**/node_modules'
154154
key: ${{ runner.os }}-mysql-node_modules-${{ hashFiles('**/package-lock.json') }}
155155
- name: npm install
156156
run: npm ci
@@ -178,7 +178,7 @@ jobs:
178178
- name: Cache node_modules
179179
uses: actions/cache@v1
180180
with:
181-
path: "**/node_modules"
181+
path: '**/node_modules'
182182
key: ${{ runner.os }}-sqlite-node_modules-${{ hashFiles('**/package-lock.json') }}
183183
- name: npm install
184184
run: npm ci
@@ -197,7 +197,7 @@ jobs:
197197
strategy:
198198
matrix:
199199
node-version: [20.6.0]
200-
mongo-version: [ 4.0 ]
200+
mongo-version: [4.0]
201201
services:
202202
# this is used for the simple-auth test
203203
mongo:
@@ -224,7 +224,7 @@ jobs:
224224
- name: Cache node_modules
225225
uses: actions/cache@v1
226226
with:
227-
path: "**/node_modules"
227+
path: '**/node_modules'
228228
key: ${{ runner.os }}-mongo-node_modules-${{ hashFiles('**/package-lock.json') }}
229229
- name: npm install
230230
run: npm ci

0 commit comments

Comments
 (0)