Skip to content

Commit c0e3b06

Browse files
patrick-stephenspatrick-stephens
committed
workflows: merge updates from master
Signed-off-by: Patrick Stephens <pat@fluent.do>
1 parent 2a44b21 commit c0e3b06

23 files changed

+109
-97
lines changed

‎.github/workflows/build-legacy-branch.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
contents: read
1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121
with:
2222
ref: ${{ inputs.ref }}
2323

@@ -53,7 +53,7 @@ jobs:
5353
packages: write
5454
steps:
5555
- name: Checkout the docker build repo for legacy builds
56-
uses: actions/checkout@v4
56+
uses: actions/checkout@v5
5757
with:
5858
repository: fluent/fluent-bit-docker-image
5959
ref: "1.8" # Fixed to this branch

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

Lines changed: 5 additions & 5 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@v4
63+
uses: actions/checkout@v5
6464
with:
6565
ref: ${{ inputs.ref }}
6666

@@ -98,7 +98,7 @@ jobs:
9898
runs-on: ${{ (contains(matrix.platform, 'arm') && 'ubuntu-22.04-arm') || 'ubuntu-latest' }}
9999
steps:
100100
- name: Checkout code
101-
uses: actions/checkout@v4
101+
uses: actions/checkout@v5
102102
with:
103103
ref: ${{ inputs.ref }}
104104
token: ${{ secrets.token }}
@@ -173,7 +173,7 @@ jobs:
173173
raw,latest
174174
175175
- name: Download production digests
176-
uses: actions/download-artifact@v4
176+
uses: actions/download-artifact@v5
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@v4
228+
uses: actions/download-artifact@v5
229229
with:
230230
pattern: debug-digests-*
231231
path: /tmp/debug-digests
@@ -397,7 +397,7 @@ jobs:
397397
packages: write
398398
steps:
399399
- name: Checkout repository
400-
uses: actions/checkout@v4
400+
uses: actions/checkout@v5
401401
with:
402402
ref: ${{ inputs.ref }}
403403

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,7 @@ jobs:
163163
# For ubuntu map to codename using the disto-info list (CSV)
164164
run: |
165165
sudo apt-get update
166-
sudo apt-get install -y distro-info
167-
sudo apt-get install -y awscli || sudo snap install aws-cli --classic
168-
166+
sudo apt-get install -y distro-info awscli
169167
TARGET=${DISTRO%*.arm64v8}
170168
if [[ "$TARGET" == "ubuntu/"* ]]; then
171169
UBUNTU_CODENAME=$(cut -d ',' -f 1,3 < "/usr/share/distro-info/ubuntu.csv"|grep "${TARGET##*/}"|cut -d ',' -f 2)
@@ -226,9 +224,7 @@ jobs:
226224
timeout-minutes: 10
227225
run: |
228226
sudo apt-get update
229-
sudo apt-get install -y createrepo-c aptly
230-
sudo apt-get install -y awscli || sudo snap install aws-cli --classic
231-
shell: bash
227+
sudo apt-get install -y createrepo-c aptly awscli
232228
env:
233229
DEBIAN_FRONTEND: noninteractive
234230

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

Lines changed: 4 additions & 4 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@v4
50+
uses: actions/checkout@v5
5151
with:
5252
ref: ${{ inputs.ref }}
5353

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

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

@@ -133,13 +133,13 @@ jobs:
133133

134134
steps:
135135
- name: Checkout repository
136-
uses: actions/checkout@v4
136+
uses: actions/checkout@v5
137137
with:
138138
ref: ${{ inputs.ref }}
139139

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

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

Lines changed: 4 additions & 4 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@v4
59+
uses: actions/checkout@v5
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@v4
105+
uses: actions/checkout@v5
106106
with:
107107
ref: ${{ inputs.ref }}
108108

@@ -205,13 +205,13 @@ jobs:
205205
contents: read
206206
steps:
207207
- name: Checkout repository
208-
uses: actions/checkout@v4
208+
uses: actions/checkout@v5
209209
with:
210210
# Need latest for checksum packaging script
211211
ref: master
212212

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

‎.github/workflows/call-integration-image-build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
contents: read
4040
packages: write
4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v5
4343
with:
4444
ref: ${{ inputs.ref }}
4545

@@ -105,7 +105,7 @@ jobs:
105105
packages: read
106106
steps:
107107
- name: Checkout repository
108-
uses: actions/checkout@v4
108+
uses: actions/checkout@v5
109109
with:
110110
ref: ${{ inputs.ref }}
111111

‎.github/workflows/call-run-integration-test.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
gke-cluster-region: ${{ steps.gke-cluster-region.outputs.stdout }}
4747
gke-cluster-zone: ${{ steps.gke-cluster-zone.outputs.stdout }}
4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v5
5050
with:
5151
ref: ${{ inputs.ref }}
5252
repository: fluent/fluent-bit-ci
@@ -57,12 +57,12 @@ jobs:
5757
cli_config_credentials_token: ${{ secrets.terraform_api_token }}
5858

5959
- id: 'auth'
60-
uses: 'google-github-actions/auth@v2'
60+
uses: 'google-github-actions/auth@v3'
6161
with:
6262
credentials_json: ${{ secrets.gcp-service-account-key }}
6363

6464
- name: 'Set up Cloud SDK'
65-
uses: 'google-github-actions/setup-gcloud@v2'
65+
uses: 'google-github-actions/setup-gcloud@v3'
6666

6767
- name: Replace terraform variables.
6868
run: |
@@ -101,7 +101,7 @@ jobs:
101101
working-directory: terraform
102102
continue-on-error: true
103103

104-
- uses: actions/github-script@v7
104+
- uses: actions/github-script@v8
105105
if: github.event_name == 'pull_request'
106106
env:
107107
PLAN: "terraform\n${{ steps.plan.outputs.stdout }}"
@@ -175,7 +175,7 @@ jobs:
175175
- name: Test image exists and cache locally
176176
run: docker pull ${{ inputs.image_name }}:${{ inputs.image_tag }}
177177

178-
- uses: actions/checkout@v4
178+
- uses: actions/checkout@v5
179179
with:
180180
ref: ${{ inputs.ref }}
181181
repository: fluent/fluent-bit-ci
@@ -234,18 +234,18 @@ jobs:
234234
env:
235235
USE_GKE_GCLOUD_AUTH_PLUGIN: true
236236
steps:
237-
- uses: actions/checkout@v4
237+
- uses: actions/checkout@v5
238238
with:
239239
ref: ${{ inputs.ref }}
240240
repository: fluent/fluent-bit-ci
241241

242242
- if: matrix.cloud == 'gke'
243-
uses: 'google-github-actions/auth@v2'
243+
uses: 'google-github-actions/auth@v3'
244244
with:
245245
credentials_json: ${{ secrets.gcp-service-account-key }}
246246

247247
- if: matrix.cloud == 'gke'
248-
uses: 'google-github-actions/setup-gcloud@v2'
248+
uses: 'google-github-actions/setup-gcloud@v3'
249249
with:
250250
install_components: 'gke-gcloud-auth-plugin'
251251

@@ -264,7 +264,7 @@ jobs:
264264

265265
- name: Get the GKE Kubeconfig
266266
if: matrix.cloud == 'gke'
267-
uses: 'google-github-actions/get-gke-credentials@v2'
267+
uses: 'google-github-actions/get-gke-credentials@v3'
268268
with:
269269
cluster_name: ${{ needs.call-run-terraform-setup.outputs.gke-cluster-name }}
270270
location: ${{ needs.call-run-terraform-setup.outputs.gke-cluster-zone }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
arch: [ linux/amd64, linux/arm64, linux/arm/v7 ]
132132
steps:
133133
- name: Checkout repository
134-
uses: actions/checkout@v4
134+
uses: actions/checkout@v5
135135
with:
136136
ref: ${{ inputs.ref }}
137137

@@ -177,7 +177,7 @@ jobs:
177177
runs-on: ubuntu-latest
178178
steps:
179179
- name: Checkout repository
180-
uses: actions/checkout@v4
180+
uses: actions/checkout@v5
181181
with:
182182
ref: ${{ inputs.ref }}
183183

‎.github/workflows/call-test-packages.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
distro: [ amazonlinux2022, amazonlinux2, centos7, centos8, debian10, debian11, ubuntu1804, ubuntu2004, ubuntu2204 ]
3838
steps:
3939
- name: Checkout repository
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v5
4141

4242
- name: Get the version
4343
id: get_version

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
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;
5252
steps:
5353
- name: Checkout repository
54-
uses: actions/checkout@v4
54+
uses: actions/checkout@v5
5555
with:
5656
ref: ${{ inputs.ref }}
5757

0 commit comments

Comments
 (0)