Merge branch 'master' into fix/timeout-issue

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

@@ -80,7 +80,7 @@ jobs:
 
       - name: Build the legacy x86_64 debug image
         if: matrix.arch == 'amd64'
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: ./Dockerfile.x86_64.debug
           context: .
@@ -102,7 +102,7 @@ jobs:
             raw,${{ matrix.suffix }}-${{ inputs.ref }}
 
       - name: Build the legacy ${{ matrix.arch }} image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: ./Dockerfile.${{ matrix.suffix }}
           context: .

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

@@ -62,7 +62,7 @@ jobs:
       # E.g. if we build version 1.9.2 we want to tag with 1.9.2 and 1.9.
       - name: Determine major version tag
         id: determine-major-version
-        uses: frabert/replace-string-action@v2.4
+        uses: frabert/replace-string-action@v2.5
         with:
           pattern: '^(\d+\.\d+).*$'
           string: ${{ inputs.version }}
@@ -114,7 +114,7 @@ jobs:
 
       - name: Build the production images
         id: build_push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: ./dockerfiles/Dockerfile
           context: .
@@ -141,7 +141,7 @@ jobs:
 
       - name: Build the debug multi-arch images
         id: debug_build_push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: ./dockerfiles/Dockerfile
           context: .
@@ -181,7 +181,7 @@ jobs:
         shell: bash
 
       - name: Upload the schema
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: ./fluent-bit-schema*.json
           name: fluent-bit-schema-${{ inputs.version }}
@@ -314,7 +314,7 @@ jobs:
           docker push ${{ inputs.registry }}/${{ inputs.image }}:windows-${{ matrix.windows-base-version }}-${{ inputs.version }}
 
         # We cannot use this action as it requires privileged mode
-        # uses: docker/build-push-action@v5
+        # uses: docker/build-push-action@v6
         # with:
         #   file: ./dockerfiles/Dockerfile.windows
         #   context: .

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

@@ -78,7 +78,7 @@ jobs:
           SOURCE_FILENAME_PREFIX: source-${{ inputs.version }}
 
       - name: Upload the source artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: source-${{ inputs.version }}
           path: source-packages/*
@@ -132,7 +132,7 @@ jobs:
 
       - name: Replace all special characters with dashes
         id: formatted_distro
-        run:
+        run: |
           output=${INPUT//[\/]/-}
           echo "$INPUT --> $output"
           echo "replaced=$output" >> "$GITHUB_OUTPUT"
@@ -151,7 +151,7 @@ jobs:
         working-directory: packaging
 
       - name: Upload the ${{ steps.formatted_distro.outputs.replaced }} artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: packages-${{ inputs.version }}-${{ steps.formatted_distro.outputs.replaced }}
           path: packaging/packages/

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

@@ -64,12 +64,21 @@ jobs:
 
   call-build-macos-package:
     if: needs.call-build-macos-legacy-check.outputs.build-type == 'modern'
-    runs-on: macos-latest
+    runs-on: ${{ matrix.config.runner }}
     environment: ${{ inputs.environment }}
     needs:
       - call-build-macos-legacy-check
     permissions:
       contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - name: "Normal macOS-latest runner (Intel)"
+            runner: macos-12
+          - name: "Apple Silicon macOS runner"
+            runner: macos-14
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -90,9 +99,9 @@ jobs:
         working-directory: build
 
       - name: Upload build packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: macos-packages
+          name: macos-packages on ${{ matrix.config.runner }}
           path: |
             build/fluent-bit-*-apple*
             build/fluent-bit-*-intel*
@@ -108,6 +117,15 @@ jobs:
       - call-build-macos-package
     permissions:
       contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - name: "Normal macOS-latest package (Intel)"
+            os: macos-12
+          - name: "Apple Silicon macOS package"
+            os: macos-14
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -116,9 +134,9 @@ jobs:
 
       - name: Download all artefacts
         continue-on-error: true
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: macos-packages
+          name: macos-packages on ${{ matrix.config.os }}
           path: artifacts/
 
       - name: Push MacOS packages to S3

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

@@ -1,6 +1,16 @@
 ---
 name: Reusable workflow to build Windows packages optionally into S3 bucket
 
+#
+# If you change dependencies etc here, please also check and update
+# the other Windows build resources:
+#
+# - DEVELOPER_GUIDE.md "Windows" section
+# - appveyor.yml
+# - .github/workflows/call-build-windows.yaml
+# - dockerfiles/Dockerfile.windows
+#
+
 on:
   workflow_call:
     inputs:
@@ -98,7 +108,7 @@ jobs:
 
       - name: Get dependencies
         run: |
-          Invoke-WebRequest -O winflexbison.zip $env:WINFLEXBISON
+          Invoke-WebRequest -OutFile winflexbison.zip $env:WINFLEXBISON
           Expand-Archive winflexbison.zip -Destination C:\WinFlexBison
           Copy-Item -Path C:\WinFlexBison/win_bison.exe C:\WinFlexBison/bison.exe
           Copy-Item -Path C:\WinFlexBison/win_flex.exe C:\WinFlexBison/flex.exe
@@ -126,7 +136,7 @@ jobs:
 
       - name: Restore cached packages of vcpkg
         id: cache-vcpkg-sources
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: |
             C:\vcpkg\packages
@@ -147,7 +157,7 @@ jobs:
 
       - name: Save packages of vcpkg
         id: save-vcpkg-sources
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         with:
           path: |
             C:\vcpkg\packages
@@ -168,9 +178,9 @@ jobs:
       - name: Upload build packages
         # Skip upload if we skipped build.
         if: ${{ matrix.config.arch != 'amd64_arm64' || needs.call-build-windows-get-meta.outputs.armSupported == 'true' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: windows-packages
+          name: windows-packages-${{ matrix.config.arch }}
           path: |
             build/*-bit-*.exe
             build/*-bit-*.msi
@@ -195,10 +205,10 @@ jobs:
           ref: master
 
       - name: Download all artefacts
-        continue-on-error: true
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: windows-packages
+          pattern: windows-packages-*
+          merge-multiple: true
           path: artifacts/
 
       - name: Set up Windows checksums

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

@@ -62,7 +62,7 @@ jobs:
             raw,${{ inputs.image-tag }}
 
       - name: Build the AMD64 image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: ./dockerfiles/Dockerfile
           context: .
@@ -74,21 +74,6 @@ jobs:
           push: true
           load: false
 
-      - name: Upload the image just in case as an artefact
-        run: |
-          docker pull $IMAGE
-          docker save --output /tmp/pr-image.tar $IMAGE
-        env:
-          IMAGE: ${{ steps.meta.outputs.tags }}
-        shell: bash
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: pr-${{ github.event.pull_request.number }}-image
-          path: /tmp/pr-image.tar
-          if-no-files-found: error
-
       - name: Extract metadata from Github
         id: meta-debug
         uses: docker/metadata-action@v5
@@ -98,7 +83,7 @@ jobs:
             raw,${{ inputs.image-tag }}-debug
 
       - name: Build the AMD64 debug image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: ./dockerfiles/Dockerfile
           context: .

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

@@ -57,12 +57,12 @@ jobs:
           cli_config_credentials_token: ${{ secrets.terraform_api_token }}
 
       - id: 'auth'
-        uses: 'google-github-actions/auth@v1'
+        uses: 'google-github-actions/auth@v2'
         with:
           credentials_json: ${{ secrets.gcp-service-account-key }}
 
       - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v1'
+        uses: 'google-github-actions/setup-gcloud@v2'
 
       - name: Replace terraform variables.
         run: |
@@ -192,18 +192,18 @@ jobs:
           bats-version: 1.9.0
 
       - name: Create k8s Kind Cluster
-        uses: helm/kind-action@v1.8.0
+        uses: helm/kind-action@v1.10.0
         with:
           node_image: kindest/node:${{ matrix.k8s-release }}
           cluster_name: kind
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3.5
+        uses: azure/setup-helm@v4
         with:
           version: v3.8.1
 
       - name: Set up Kubectl
-        uses: azure/setup-kubectl@v3.2
+        uses: azure/setup-kubectl@v4
 
       - name: Run tests
         timeout-minutes: 60
@@ -240,12 +240,12 @@ jobs:
           repository: fluent/fluent-bit-ci
 
       - if: matrix.cloud == 'gke'
-        uses: 'google-github-actions/auth@v1'
+        uses: 'google-github-actions/auth@v2'
         with:
           credentials_json: ${{ secrets.gcp-service-account-key }}
 
       - if: matrix.cloud == 'gke'
-        uses: 'google-github-actions/setup-gcloud@v1'
+        uses: 'google-github-actions/setup-gcloud@v2'
         with:
           install_components: 'gke-gcloud-auth-plugin'
 
@@ -255,16 +255,16 @@ jobs:
           bats-version: 1.9.0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3.5
+        uses: azure/setup-helm@v4
         with:
           version: v3.8.1
 
       - name: Set up Kubectl
-        uses: azure/setup-kubectl@v3.2
+        uses: azure/setup-kubectl@v4
 
       - name: Get the GKE Kubeconfig
         if: matrix.cloud == 'gke'
-        uses: 'google-github-actions/get-gke-credentials@v1'
+        uses: 'google-github-actions/get-gke-credentials@v2'
         with:
           cluster_name: ${{ needs.call-run-terraform-setup.outputs.gke-cluster-name }}
           location: ${{ needs.call-run-terraform-setup.outputs.gke-cluster-zone }}

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

@@ -184,15 +184,15 @@ jobs:
           ref: ${{ inputs.ref }}
 
       - name: Create k8s Kind Cluster
-        uses: helm/kind-action@v1.8.0
+        uses: helm/kind-action@v1.10.0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3.5
+        uses: azure/setup-helm@v4
         with:
           version: v3.6.3
 
       - name: Set up Kubectl
-        uses: azure/setup-kubectl@v3.2
+        uses: azure/setup-kubectl@v4
 
       - name: Test the HTTP server is responding
         timeout-minutes: 5