Skip to content

Commit 08687fc

Browse files
authored
Merge branch 'nginx:master' into master
2 parents 9b7e8e6 + f682580 commit 08687fc

File tree

9 files changed

+908
-15
lines changed

9 files changed

+908
-15
lines changed

.github/workflows/check-whitespace.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
check-whitespace:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
with:
1616
fetch-depth: 0
1717

.github/workflows/ci-dev-distro-compiler.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
fi
4848
npm install -g node-gyp
4949
50-
- uses: actions/checkout@v4
50+
- uses: actions/checkout@v5
5151

5252
- name: configure unit CC=${{ matrix.compiler }}
5353
run: |
@@ -137,7 +137,7 @@ jobs:
137137
apk add clang
138138
fi
139139
140-
- uses: actions/checkout@v4
140+
- uses: actions/checkout@v5
141141

142142
- name: configure unit CC=${{ matrix.compiler }}
143143
run: |

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
os: ubuntu-latest
4343

4444
steps:
45-
- uses: actions/checkout@v4
45+
- uses: actions/checkout@v5
4646

4747
# Provides module, language version and testpath from build name
4848
- name: Output build metadata
@@ -96,7 +96,7 @@ jobs:
9696
##
9797

9898
- name: Clone njs repository
99-
uses: actions/checkout@v4
99+
uses: actions/checkout@v5
100100
with:
101101
repository: nginx/njs
102102
ref: '${{ steps.metadata.outputs.njs_version }}'

.github/workflows/clang-ast.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
ruby-dev openjdk-21-jdk npm
3636
npm install -g node-gyp
3737
38-
- uses: actions/checkout@v4
38+
- uses: actions/checkout@v5
3939

4040
- name: Checkout and build clang-ast
4141
run: |

.github/workflows/unitctl.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
os: macos-latest
4646
target: aarch64-apple-darwin
4747
steps:
48-
- uses: actions/checkout@v4
48+
- uses: actions/checkout@v5
4949

5050
- run: rustup update stable
5151
- run: rustup target add ${{ matrix.target }}
@@ -102,7 +102,7 @@ jobs:
102102
target: x86_64-apple-darwin
103103

104104
steps:
105-
- uses: actions/checkout@v4
105+
- uses: actions/checkout@v5
106106

107107
- run: rustup update stable
108108
- run: rustup target add ${{ matrix.target }}
@@ -180,7 +180,7 @@ jobs:
180180
needs: [build]
181181
runs-on: ubuntu-latest
182182
steps:
183-
- uses: actions/download-artifact@v4
183+
- uses: actions/download-artifact@v5
184184
with:
185185
merge-multiple: true
186186

0 commit comments

Comments
 (0)