Skip to content

Commit 5448880

Browse files
committed
Merge branch 'master' of github.com:jmccormick7/fluent-bit into enable-metric-proxy-plugins
2 parents 82d792a + 2f7791e commit 5448880

File tree

95 files changed

+13051
-1460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+13051
-1460
lines changed

.github/workflows/call-build-images.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
shell: bash
142142

143143
- name: Upload ${{ matrix.target }} digest
144-
uses: actions/upload-artifact@v4
144+
uses: actions/upload-artifact@v5
145145
with:
146146
name: ${{ matrix.target }}-digests-${{ (contains(matrix.platform, 'arm/v7') && 'arm-v7') || matrix.platform }}
147147
path: /tmp/digests/*
@@ -173,7 +173,7 @@ jobs:
173173
raw,latest
174174
175175
- name: Download production digests
176-
uses: actions/download-artifact@v5
176+
uses: actions/download-artifact@v6
177177
with:
178178
pattern: production-digests-*
179179
path: /tmp/production-digests
@@ -225,7 +225,7 @@ jobs:
225225
raw,latest-debug
226226
227227
- name: Download debug digests
228-
uses: actions/download-artifact@v5
228+
uses: actions/download-artifact@v6
229229
with:
230230
pattern: debug-digests-*
231231
path: /tmp/debug-digests
@@ -278,7 +278,7 @@ jobs:
278278
shell: bash
279279

280280
- name: Upload the schema
281-
uses: actions/upload-artifact@v4
281+
uses: actions/upload-artifact@v5
282282
with:
283283
path: ./fluent-bit-schema*.json
284284
name: fluent-bit-schema-${{ inputs.version }}

.github/workflows/call-build-linux-packages.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
SOURCE_FILENAME_PREFIX: source-${{ inputs.version }}
7979

8080
- name: Upload the source artifacts
81-
uses: actions/upload-artifact@v4
81+
uses: actions/upload-artifact@v5
8282
with:
8383
name: source-${{ inputs.version }}
8484
path: source-packages/*
@@ -150,7 +150,7 @@ jobs:
150150
working-directory: packaging
151151

152152
- name: Upload the ${{ steps.formatted_distro.outputs.replaced }} artifacts
153-
uses: actions/upload-artifact@v4
153+
uses: actions/upload-artifact@v5
154154
with:
155155
name: packages-${{ inputs.version }}-${{ steps.formatted_distro.outputs.replaced }}
156156
path: packaging/packages/

.github/workflows/call-build-macos.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
working-directory: build
107107

108108
- name: Upload build packages
109-
uses: actions/upload-artifact@v4
109+
uses: actions/upload-artifact@v5
110110
with:
111111
name: macos-packages on ${{ matrix.config.runner }}
112112
path: |
@@ -139,7 +139,7 @@ jobs:
139139

140140
- name: Download all artefacts
141141
continue-on-error: true
142-
uses: actions/download-artifact@v5
142+
uses: actions/download-artifact@v6
143143
with:
144144
name: macos-packages on ${{ matrix.config.os }}
145145
path: artifacts/

.github/workflows/call-build-windows.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ jobs:
184184
- name: Upload build packages
185185
# Skip upload if we skipped build.
186186
if: ${{ matrix.config.arch != 'amd64_arm64' || needs.call-build-windows-get-meta.outputs.armSupported == 'true' }}
187-
uses: actions/upload-artifact@v4
187+
uses: actions/upload-artifact@v5
188188
with:
189189
name: windows-packages-${{ matrix.config.arch }}
190190
path: |
@@ -211,7 +211,7 @@ jobs:
211211
ref: master
212212

213213
- name: Download all artefacts
214-
uses: actions/download-artifact@v5
214+
uses: actions/download-artifact@v6
215215
with:
216216
pattern: windows-packages-*
217217
merge-multiple: true

.github/workflows/call-windows-unit-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ jobs:
158158
working-directory: build
159159

160160
- name: Upload unit test binaries
161-
uses: actions/upload-artifact@v4
161+
uses: actions/upload-artifact@v5
162162
with:
163163
name: windows-unit-tests-${{ matrix.config.arch }}
164164
path: |

.github/workflows/cron-scorecards-analysis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
publish_results: true
3939

4040
- name: "Upload artifact"
41-
uses: actions/upload-artifact@v4
41+
uses: actions/upload-artifact@v5
4242
with:
4343
name: SARIF file
4444
path: results.sarif

.github/workflows/cron-trivy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080

8181
# In case we need to analyse the uploaded files for some reason.
8282
- name: Detain results for debug if needed
83-
uses: actions/upload-artifact@v4
83+
uses: actions/upload-artifact@v5
8484
with:
8585
name: trivy-results-${{ matrix.local_tag }}.sarif
8686
path: trivy-results-${{ matrix.local_tag }}.sarif

.github/workflows/cron-unstable-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173

174174
- name: Download all artefacts
175175
continue-on-error: true
176-
uses: actions/download-artifact@v5
176+
uses: actions/download-artifact@v6
177177
with:
178178
path: artifacts/
179179

.github/workflows/pr-fuzz.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
language: c
2727
output-sarif: true
2828
- name: Upload Crash
29-
uses: actions/upload-artifact@v4
29+
uses: actions/upload-artifact@v5
3030
if: failure() && steps.build.outcome == 'success'
3131
with:
3232
name: artifacts

.github/workflows/pr-perf-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
permissions:
3333
pull-requests: write
3434
steps:
35-
- uses: actions/download-artifact@v5
35+
- uses: actions/download-artifact@v6
3636

3737
- name: Upload plots to CML
3838
run: |

0 commit comments

Comments
 (0)