Skip to content

Commit 43cd1f4

Browse files
rituparnakhaundrituparnakhaund
authored
Merge branch 'fluent:master' into out_s3-parquet-format-compression-split
2 parents 2f9af92 + 5880717 commit 43cd1f4

88 files changed

Lines changed: 4785 additions & 453 deletions

File tree

Some content is hidden

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

‎.github/actions/generate-package-build-matrix/action.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ runs:
2626
using: "composite"
2727
steps:
2828
- name: Checkout code for version check
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3030
with:
3131
ref: ${{ inputs.ref }}
3232
path: version-check
33+
persist-credentials: false
3334

3435
- name: Determine target type
3536
id: determine-build-type

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ jobs:
6060
contents: read
6161
steps:
6262
- name: Checkout code
63-
uses: actions/checkout@v6
63+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
6464
with:
6565
ref: ${{ inputs.ref }}
6666

6767
# For main branch/releases we want to tag with the major version.
6868
# E.g. if we build version 1.9.2 we want to tag with 1.9.2 and 1.9.
6969
- name: Determine major version tag
7070
id: determine-major-version
71-
uses: frabert/replace-string-action@v2.5
71+
uses: frabert/replace-string-action@fc6c5eb9238279ae230de582075b1a29f93cfa6b # v2.5.2
7272
with:
7373
pattern: '^(\d+\.\d+).*$'
7474
string: ${{ inputs.version }}
@@ -98,24 +98,24 @@ jobs:
9898
runs-on: ${{ (contains(matrix.platform, 'arm') && 'ubuntu-22.04-arm') || 'ubuntu-latest' }}
9999
steps:
100100
- name: Checkout code
101-
uses: actions/checkout@v6
101+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
102102
with:
103103
ref: ${{ inputs.ref }}
104104
token: ${{ secrets.token }}
105105

106106
- name: Set up Docker Buildx
107-
uses: docker/setup-buildx-action@v4
107+
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
108108

109109
- name: Log in to the Container registry
110-
uses: docker/login-action@v4
110+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
111111
with:
112112
registry: ${{ inputs.registry }}
113113
username: ${{ github.actor }}
114114
password: ${{ secrets.token }}
115115

116116
- name: Build and push by digest the standard ${{ matrix.target }} image
117117
id: build
118-
uses: docker/build-push-action@v7
118+
uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
119119
with:
120120
# Use path context rather than Git context as we want local files
121121
file: ./dockerfiles/Dockerfile
@@ -141,7 +141,7 @@ jobs:
141141
shell: bash
142142

143143
- name: Upload ${{ matrix.target }} digest
144-
uses: actions/upload-artifact@v7
144+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
145145
with:
146146
name: ${{ matrix.target }}-digests-${{ (contains(matrix.platform, 'arm/v7') && 'arm-v7') || matrix.platform }}
147147
path: /tmp/digests/*
@@ -164,7 +164,7 @@ jobs:
164164
steps:
165165
- name: Extract metadata from Github
166166
id: meta
167-
uses: docker/metadata-action@v5
167+
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
168168
with:
169169
images: ${{ inputs.registry }}/${{ inputs.image }}
170170
tags: |
@@ -173,17 +173,17 @@ jobs:
173173
raw,latest
174174
175175
- name: Download production digests
176-
uses: actions/download-artifact@v8
176+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
177177
with:
178178
pattern: production-digests-*
179179
path: /tmp/production-digests
180180
merge-multiple: true
181181

182182
- name: Set up Docker Buildx
183-
uses: docker/setup-buildx-action@v4
183+
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
184184

185185
- name: Log in to the Container registry
186-
uses: docker/login-action@v4
186+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
187187
with:
188188
registry: ${{ inputs.registry }}
189189
username: ${{ github.actor }}
@@ -216,7 +216,7 @@ jobs:
216216
version: ${{ steps.debug-meta.outputs.version }}
217217
steps:
218218
- id: debug-meta
219-
uses: docker/metadata-action@v5
219+
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
220220
with:
221221
images: ${{ inputs.registry }}/${{ inputs.image }}
222222
tags: |
@@ -225,17 +225,17 @@ jobs:
225225
raw,latest-debug
226226
227227
- name: Download debug digests
228-
uses: actions/download-artifact@v8
228+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
229229
with:
230230
pattern: debug-digests-*
231231
path: /tmp/debug-digests
232232
merge-multiple: true
233233

234234
- name: Set up Docker Buildx
235-
uses: docker/setup-buildx-action@v4
235+
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
236236

237237
- name: Log in to the Container registry
238-
uses: docker/login-action@v4
238+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
239239
with:
240240
registry: ${{ inputs.registry }}
241241
username: ${{ github.actor }}
@@ -265,7 +265,7 @@ jobs:
265265
packages: read
266266
steps:
267267
- name: Log in to the Container registry
268-
uses: docker/login-action@v4
268+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
269269
with:
270270
registry: ${{ inputs.registry }}
271271
username: ${{ inputs.username }}
@@ -278,7 +278,7 @@ jobs:
278278
shell: bash
279279

280280
- name: Upload the schema
281-
uses: actions/upload-artifact@v7
281+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
282282
with:
283283
path: ./fluent-bit-schema*.json
284284
name: fluent-bit-schema-${{ inputs.version }}
@@ -297,7 +297,7 @@ jobs:
297297
packages: read
298298
steps:
299299
- name: Log in to the Container registry
300-
uses: docker/login-action@v4
300+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
301301
with:
302302
registry: ${{ inputs.registry }}
303303
username: ${{ inputs.username }}
@@ -314,7 +314,7 @@ jobs:
314314
severity: "CRITICAL,HIGH"
315315

316316
- name: Dockle - multi-arch
317-
uses: hands-lab/dockle-action@v1
317+
uses: hands-lab/dockle-action@083a964bbcffa92bdd5f85fe3672da5d81ae1a57 # v1
318318
with:
319319
image: "${{ inputs.registry }}/${{ inputs.image }}:${{ inputs.version }}"
320320
exit-code: "1"
@@ -337,7 +337,7 @@ jobs:
337337
environment: ${{ inputs.environment }}
338338
steps:
339339
- name: Install cosign
340-
uses: sigstore/cosign-installer@v2
340+
uses: sigstore/cosign-installer@6f9f17788090df1f26f669e9d70d6ae9567deba6 # v4.1.2
341341

342342
- name: Cosign keyless signing using Rektor public transparency log
343343
# This step uses the identity token to provision an ephemeral certificate
@@ -399,15 +399,15 @@ jobs:
399399
IMAGE: ${{ inputs.registry }}/${{ inputs.image }}:windows-${{ matrix.windows-base-version }}-${{ inputs.version }}
400400
steps:
401401
- name: Checkout repository
402-
uses: actions/checkout@v6
402+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
403403
with:
404404
ref: ${{ inputs.ref }}
405405

406406
# - name: Set up Docker Buildx
407407
# uses: docker/setup-buildx-action@v4
408408

409409
- name: Log in to the Container registry
410-
uses: docker/login-action@v4
410+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
411411
with:
412412
registry: ${{ inputs.registry }}
413413
username: ${{ inputs.username }}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
contents: read
6161
steps:
6262
- name: Checkout code
63-
uses: actions/checkout@v6
63+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
6464
with:
6565
ref: ${{ inputs.ref }}
6666
path: source
@@ -78,7 +78,7 @@ jobs:
7878
SOURCE_FILENAME_PREFIX: source-${{ inputs.version }}
7979

8080
- name: Upload the source artifacts
81-
uses: actions/upload-artifact@v7
81+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
8282
with:
8383
name: source-${{ inputs.version }}
8484
path: source-packages/*
@@ -87,7 +87,7 @@ jobs:
8787
# Pick up latest master version
8888
- name: Checkout code for action
8989
if: inputs.environment == 'staging'
90-
uses: actions/checkout@v6
90+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
9191
with:
9292
path: action-support
9393

@@ -115,17 +115,17 @@ jobs:
115115
continue-on-error: ${{ inputs.ignore_failing_targets || false }}
116116
steps:
117117
- name: Checkout code
118-
uses: actions/checkout@v6
118+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
119119
with:
120120
ref: ${{ inputs.ref }}
121121

122122
- name: Set up Docker Buildx
123-
uses: docker/setup-buildx-action@v4
123+
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
124124

125125
# Raspbian requires ARMv6 emulation
126126
- name: Set up QEMU
127127
if: contains(matrix.distro, 'raspbian')
128-
uses: docker/setup-qemu-action@v4
128+
uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
129129
with:
130130
image: tonistiigi/binfmt:qemu-v7.0.0-28 # See: https://github.com/docker/setup-qemu-action/issues/198#issuecomment-2653791775
131131

@@ -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@v7
153+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
154154
with:
155155
name: packages-${{ inputs.version }}-${{ steps.formatted_distro.outputs.replaced }}
156156
path: packaging/packages/
@@ -196,7 +196,7 @@ jobs:
196196
# Pick up latest master version
197197
- name: Checkout code for action
198198
if: inputs.environment == 'staging'
199-
uses: actions/checkout@v6
199+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
200200
with:
201201
path: action-support
202202

@@ -233,11 +233,11 @@ jobs:
233233
DEBIAN_FRONTEND: noninteractive
234234

235235
- name: Checkout code for repo metadata construction - always latest
236-
uses: actions/checkout@v6
236+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
237237

238238
- name: Import GPG key for signing
239239
id: import_gpg
240-
uses: crazy-max/ghaction-import-gpg@v7
240+
uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7.0.0
241241
with:
242242
gpg_private_key: ${{ secrets.gpg_private_key }}
243243
passphrase: ${{ secrets.gpg_private_key_passphrase }}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
contents: read
4848
steps:
4949
- name: Checkout code
50-
uses: actions/checkout@v6
50+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
5151
with:
5252
ref: ${{ inputs.ref }}
5353

@@ -83,7 +83,7 @@ jobs:
8383

8484
steps:
8585
- name: Checkout repository
86-
uses: actions/checkout@v6
86+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
8787
with:
8888
ref: ${{ inputs.ref }}
8989

@@ -93,7 +93,7 @@ jobs:
9393
brew install bison flex libyaml openssl pkgconfig || true
9494
9595
- name: Install cmake
96-
uses: jwlawson/actions-setup-cmake@v2
96+
uses: jwlawson/actions-setup-cmake@0d6a7d60b009d01c9e7523be22153ff8f19460d3 # v2.2.0
9797
with:
9898
cmake-version: "${{ matrix.config.cmake_version }}"
9999

@@ -106,7 +106,7 @@ jobs:
106106
working-directory: build
107107

108108
- name: Upload build packages
109-
uses: actions/upload-artifact@v7
109+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
110110
with:
111111
name: macos-packages-${{ matrix.config.runner }}
112112
path: |
@@ -126,12 +126,12 @@ jobs:
126126
contents: read
127127
steps:
128128
- name: Checkout repository
129-
uses: actions/checkout@v6
129+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
130130
with:
131131
ref: ${{ inputs.ref }}
132132

133133
- name: Download all artefacts
134-
uses: actions/download-artifact@v8
134+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
135135
with:
136136
pattern: macos-packages-*
137137
merge-multiple: true

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
armSupported: ${{ steps.armcheck.outputs.armSupported }}
5757
steps:
5858
- name: Checkout repository
59-
uses: actions/checkout@v6
59+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
6060
with:
6161
ref: ${{ inputs.ref }}
6262

@@ -102,7 +102,7 @@ jobs:
102102
PATH: C:\ProgramData\Chocolatey\bin;c:/Program Files/Git/cmd;c:/Windows/system32;C:/Windows/System32/WindowsPowerShell/v1.0;$ENV:WIX/bin;C:/Program Files/CMake/bin;C:\vcpkg;
103103
steps:
104104
- name: Checkout repository
105-
uses: actions/checkout@v6
105+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
106106
with:
107107
ref: ${{ inputs.ref }}
108108

@@ -195,12 +195,12 @@ jobs:
195195
shell: pwsh
196196

197197
- name: Set up with Developer Command Prompt for Microsoft Visual C++
198-
uses: ilammy/msvc-dev-cmd@v1
198+
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
199199
with:
200200
arch: ${{ matrix.config.arch }}
201201

202202
- name: Get gzip command and nsis w/ chocolatey
203-
uses: crazy-max/ghaction-chocolatey@v3
203+
uses: crazy-max/ghaction-chocolatey@dff3862348493b11fba2fbc49147b6d2dfe09b66 # v4.0.0
204204
with:
205205
args: install gzip nsis -y
206206

@@ -213,7 +213,7 @@ jobs:
213213

214214
- name: Restore cached packages of vcpkg
215215
id: cache-vcpkg-sources
216-
uses: actions/cache/restore@v5
216+
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
217217
with:
218218
path: |
219219
C:\vcpkg\installed
@@ -239,7 +239,7 @@ jobs:
239239

240240
- name: Save packages of vcpkg
241241
id: save-vcpkg-sources
242-
uses: actions/cache/save@v5
242+
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
243243
with:
244244
path: |
245245
C:\vcpkg\installed
@@ -260,7 +260,7 @@ jobs:
260260
- name: Upload build packages
261261
# Skip upload if we skipped build.
262262
if: ${{ matrix.config.arch != 'amd64_arm64' || needs.call-build-windows-get-meta.outputs.armSupported == 'true' }}
263-
uses: actions/upload-artifact@v7
263+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
264264
with:
265265
name: windows-packages-${{ matrix.config.arch }}
266266
path: |
@@ -281,13 +281,13 @@ jobs:
281281
contents: read
282282
steps:
283283
- name: Checkout repository
284-
uses: actions/checkout@v6
284+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
285285
with:
286286
# Need latest for checksum packaging script
287287
ref: master
288288

289289
- name: Download all artefacts
290-
uses: actions/download-artifact@v8
290+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
291291
with:
292292
pattern: windows-packages-*
293293
merge-multiple: true

0 commit comments

Comments
 (0)