Skip to content

Commit c98597e

Browse files
mgolmgol
authored
Build: Reformat GitHub workflow Yaml files
Use Prettier 3.1.0 to reformat the Yaml files. This makes their format identical to the one used on `3.x-stable`, making for much easier cherry-picks. The main difference is the list under `steps:` was not indented while all other lists were. Closes gh-5364
1 parent fb0cc27 commit c98597e

File tree

2 files changed

+70
-71
lines changed

2 files changed

+70
-71
lines changed

‎.github/workflows/codeql-analysis.yml

+38-39
Original file line numberDiff line numberDiff line change
@@ -5,55 +5,54 @@ on:
55
push:
66
branches-ignore: "dependabot/**"
77
schedule:
8-
- cron: '0 4 * * 6'
8+
- cron: "0 4 * * 6"
99

1010
permissions:
1111
contents: read # to fetch code (actions/checkout)
1212

1313
jobs:
1414
CodeQL-Build:
15-
1615
permissions:
1716
contents: read # to fetch code (actions/checkout)
1817
security-events: write # (github/codeql-action/autobuild)
1918

2019
runs-on: ubuntu-latest
2120

2221
steps:
23-
- name: Checkout repository
24-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
25-
with:
26-
# We must fetch at least the immediate parents so that if this is
27-
# a pull request then we can checkout the head.
28-
fetch-depth: 2
29-
30-
# If this run was triggered by a pull request event, then checkout
31-
# the head of the pull request instead of the merge commit.
32-
- run: git checkout HEAD^2
33-
if: ${{ github.event_name == 'pull_request' }}
34-
35-
# Initializes the CodeQL tools for scanning.
36-
- name: Initialize CodeQL
37-
uses: github/codeql-action/init@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
38-
# Override language selection by uncommenting this and choosing your languages
39-
# with:
40-
# languages: go, javascript, csharp, python, cpp, java
41-
42-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
43-
# If this step fails, then you should remove it and run the build manually (see below)
44-
- name: Autobuild
45-
uses: github/codeql-action/autobuild@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
46-
47-
# ℹ️ Command-line programs to run using the OS shell.
48-
# 📚 https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
49-
50-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
51-
# and modify them (or add more) to build your code if your project
52-
# uses a compiled language
53-
54-
#- run: |
55-
# make bootstrap
56-
# make release
57-
58-
- name: Perform CodeQL Analysis
59-
uses: github/codeql-action/analyze@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
22+
- name: Checkout repository
23+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
24+
with:
25+
# We must fetch at least the immediate parents so that if this is
26+
# a pull request then we can checkout the head.
27+
fetch-depth: 2
28+
29+
# If this run was triggered by a pull request event, then checkout
30+
# the head of the pull request instead of the merge commit.
31+
- run: git checkout HEAD^2
32+
if: ${{ github.event_name == 'pull_request' }}
33+
34+
# Initializes the CodeQL tools for scanning.
35+
- name: Initialize CodeQL
36+
uses: github/codeql-action/init@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
37+
# Override language selection by uncommenting this and choosing your languages
38+
# with:
39+
# languages: go, javascript, csharp, python, cpp, java
40+
41+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
42+
# If this step fails, then you should remove it and run the build manually (see below)
43+
- name: Autobuild
44+
uses: github/codeql-action/autobuild@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
45+
46+
# ℹ️ Command-line programs to run using the OS shell.
47+
# 📚 https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
48+
49+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
50+
# and modify them (or add more) to build your code if your project
51+
# uses a compiled language
52+
53+
#- run: |
54+
# make bootstrap
55+
# make release
56+
57+
- name: Perform CodeQL Analysis
58+
uses: github/codeql-action/analyze@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5

‎.github/workflows/node.js.yml

+32-32
Original file line numberDiff line numberDiff line change
@@ -44,42 +44,42 @@ jobs:
4444
NPM_SCRIPT: "test:browser"
4545
BROWSERS: "FirefoxHeadless"
4646
steps:
47-
- name: Checkout
48-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
47+
- name: Checkout
48+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4949

50-
- name: Cache
51-
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
52-
with:
53-
path: ~/.npm
54-
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }}
55-
restore-keys: |
56-
${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-npm-lock-
50+
- name: Cache
51+
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
52+
with:
53+
path: ~/.npm
54+
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }}
55+
restore-keys: |
56+
${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-npm-lock-
5757
58-
- name: Use Node.js ${{ matrix.NODE_VERSION }}
59-
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
60-
with:
61-
node-version: ${{ matrix.NODE_VERSION }}
58+
- name: Use Node.js ${{ matrix.NODE_VERSION }}
59+
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
60+
with:
61+
node-version: ${{ matrix.NODE_VERSION }}
6262

63-
- name: Install firefox ESR
64-
run: |
65-
export FIREFOX_SOURCE_URL='https://download.mozilla.org/?product=firefox-esr-latest&lang=en-US&os=linux64'
66-
wget --no-verbose $FIREFOX_SOURCE_URL -O - | tar -jx -C ${HOME}
67-
if: contains(matrix.NAME, 'Firefox ESR')
63+
- name: Install firefox ESR
64+
run: |
65+
export FIREFOX_SOURCE_URL='https://download.mozilla.org/?product=firefox-esr-latest&lang=en-US&os=linux64'
66+
wget --no-verbose $FIREFOX_SOURCE_URL -O - | tar -jx -C ${HOME}
67+
if: contains(matrix.NAME, 'Firefox ESR')
6868

69-
- name: Install dependencies
70-
run: npm install
69+
- name: Install dependencies
70+
run: npm install
7171

72-
- name: Install Playwright dependencies
73-
run: npx playwright-webkit install-deps
74-
if: matrix.NPM_SCRIPT == 'test:browser' && contains(matrix.BROWSERS, 'WebkitHeadless')
72+
- name: Install Playwright dependencies
73+
run: npx playwright-webkit install-deps
74+
if: matrix.NPM_SCRIPT == 'test:browser' && contains(matrix.BROWSERS, 'WebkitHeadless')
7575

76-
- name: Lint code
77-
run: npm run build:all && npm run lint
78-
if: matrix.NODE_VERSION == '18.x'
76+
- name: Lint code
77+
run: npm run build:all && npm run lint
78+
if: matrix.NODE_VERSION == '18.x'
7979

80-
- name: Run tests
81-
env:
82-
BROWSERS: ${{ matrix.BROWSERS }}
83-
run: |
84-
export PATH=${HOME}/firefox:$PATH
85-
npm run ${{ matrix.NPM_SCRIPT }}
80+
- name: Run tests
81+
env:
82+
BROWSERS: ${{ matrix.BROWSERS }}
83+
run: |
84+
export PATH=${HOME}/firefox:$PATH
85+
npm run ${{ matrix.NPM_SCRIPT }}

0 commit comments

Comments
 (0)