Skip to content

Commit 50fac01

Browse files
committed
fixup! format test.yaml file to meet prettier requirements
1 parent ca5e9a6 commit 50fac01

File tree

2 files changed

+53
-26
lines changed

2 files changed

+53
-26
lines changed

.github/workflows/lint.yaml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
---
2+
name: lint
3+
4+
on:
5+
pull_request:
6+
7+
permissions:
8+
contents: read
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name || github.sha }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
lint:
16+
runs-on: ubuntu-24.04
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
- uses: actions/setup-node@v4
21+
with:
22+
node-version: '22'
23+
cache: yarn
24+
- name: install typescript
25+
shell: bash
26+
run: yarn global add typescript@4.9.5
27+
- name: install dependencies
28+
run: yarn install --frozen-lockfile --network-concurrency 1
29+
- name: Fetch base for Prettier
30+
env:
31+
BASE_REF: ${{ github.event.pull_request.base.ref }}
32+
run: git fetch --no-tags origin "$BASE_REF" --depth=50
33+
- name: Prettier (changed files)
34+
run: scripts/format-changed.sh
35+
env:
36+
BASE_SHA: ${{ github.event.pull_request.base.sha }}
37+
BASE_REF: ${{ github.event.pull_request.base.ref }}
38+
- uses: actions/setup-python@v5
39+
with:
40+
python-version: '3.9'
41+
cache: pip
42+
- name: Install python deps
43+
run: pip install flake8
44+
- name: Lint Javascript
45+
run: yarn run --silent lint -- --max-warnings 0
46+
- name: Lint Markdown
47+
run: yarn run --silent lint_md
48+
- name: Lint python
49+
run: flake8 $(git ls-files "*.py")
50+
- name: Lint Yaml
51+
run: yamllint -c yamllint.yml $(git ls-files "*.yml")

.github/workflows/tests.yaml

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ on:
88
branches-ignore:
99
- 'q/*/**'
1010

11-
pull_request:
12-
1311
env:
1412
# Secrets
1513
azurebackend_AZURE_STORAGE_ACCESS_KEY: >-
@@ -95,17 +93,6 @@ jobs:
9593
run: yarn global add typescript@4.9.5
9694
- name: install dependencies
9795
run: yarn install --frozen-lockfile --network-concurrency 1
98-
- name: Fetch base for Prettier
99-
if: ${{ github.event_name == 'pull_request' }}
100-
env:
101-
BASE_REF: ${{ github.event.pull_request.base.ref }}
102-
run: git fetch --no-tags origin "$BASE_REF" --depth=50
103-
- name: Prettier (changed files)
104-
run: scripts/format-changed.sh
105-
env:
106-
BASE_SHA: ${{ github.event.pull_request.base.sha }}
107-
BASE_REF: ${{ github.event.pull_request.base.ref }}
108-
if: ${{ github.event_name == 'pull_request' }}
10996
- uses: actions/setup-python@v5
11097
with:
11198
python-version: '3.9'
@@ -123,7 +110,6 @@ jobs:
123110

124111
unit-tests:
125112
runs-on: ubuntu-24.04
126-
if: ${{ github.event_name != 'pull_request' }}
127113
steps:
128114
- name: Checkout
129115
uses: actions/checkout@v4
@@ -174,7 +160,6 @@ jobs:
174160

175161
build:
176162
runs-on: ubuntu-latest
177-
if: ${{ github.event_name != 'pull_request' }}
178163
permissions:
179164
contents: read
180165
packages: write
@@ -261,7 +246,6 @@ jobs:
261246

262247
multiple-backend:
263248
runs-on: ubuntu-24.04
264-
if: ${{ github.event_name != 'pull_request' }}
265249
needs: build
266250
env:
267251
CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}-testcoverage
@@ -321,7 +305,6 @@ jobs:
321305

322306
mongo-v0-ft-tests:
323307
runs-on: ubuntu-24.04
324-
if: ${{ github.event_name != 'pull_request' }}
325308
needs: build
326309
env:
327310
S3BACKEND: mem
@@ -381,7 +364,6 @@ jobs:
381364

382365
mongo-v1-ft-tests:
383366
runs-on: ubuntu-24.04
384-
if: ${{ github.event_name != 'pull_request' }}
385367
needs: build
386368
env:
387369
S3BACKEND: mem
@@ -454,7 +436,6 @@ jobs:
454436
job-name: file-ft-tests-null-compat
455437
name: ${{ matrix.job-name }}
456438
runs-on: ubuntu-24.04
457-
if: ${{ github.event_name != 'pull_request' }}
458439
needs: build
459440
env:
460441
S3BACKEND: file
@@ -529,7 +510,6 @@ jobs:
529510
job-name: s3c-ft-tests-v1
530511
name: ${{ matrix.job-name }}
531512
runs-on: ubuntu-24.04
532-
if: ${{ github.event_name != 'pull_request' }}
533513
needs: build
534514
env:
535515
S3BACKEND: file
@@ -648,7 +628,7 @@ jobs:
648628
utapi-v2-tests:
649629
runs-on: ubuntu-24.04
650630
needs: build
651-
if: ${{ github.event_name != 'pull_request' && always() }}
631+
if: always()
652632
env:
653633
ENABLE_UTAPI_V2: t
654634
S3BACKEND: mem
@@ -693,7 +673,6 @@ jobs:
693673

694674
sur-tests:
695675
runs-on: ubuntu-24.04
696-
if: ${{ github.event_name != 'pull_request' }}
697676
needs: build
698677
strategy:
699678
matrix:
@@ -752,7 +731,6 @@ jobs:
752731

753732
kmip-ft-tests:
754733
runs-on: ubuntu-24.04
755-
if: ${{ github.event_name != 'pull_request' }}
756734
needs: build
757735
env:
758736
S3BACKEND: file
@@ -813,7 +791,6 @@ jobs:
813791

814792
kmip-cluster-ft-tests:
815793
runs-on: ubuntu-latest
816-
if: ${{ github.event_name != 'pull_request' }}
817794
needs: build
818795
env:
819796
S3BACKEND: file
@@ -904,7 +881,6 @@ jobs:
904881
matrix.opts.globalEncryptionEnabled && '-global' || ''
905882
}}
906883
runs-on: ubuntu-latest
907-
if: ${{ github.event_name != 'pull_request' }}
908884
needs: build
909885
env:
910886
S3BACKEND: file
@@ -1061,7 +1037,7 @@ jobs:
10611037
- mongo-v0-ft-tests
10621038
- mongo-v1-ft-tests
10631039
- file-ft-tests
1064-
if: ${{ github.event_name != 'pull_request' && always() }}
1040+
if: always()
10651041
steps:
10661042
- name: Checkout
10671043
uses: actions/checkout@v4

0 commit comments

Comments
 (0)