Skip to content

Commit

Permalink
Merge branch 'fluent:master' into fix-win-build
Browse files Browse the repository at this point in the history
  • Loading branch information
Dima Altukhov authored Oct 3, 2023
2 parents 299ed6c + 92e0435 commit 6bfa55b
Show file tree
Hide file tree
Showing 561 changed files with 14,149 additions and 3,008 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/build-legacy-branch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
contents: read
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

Expand Down Expand Up @@ -53,34 +53,34 @@ jobs:
packages: write
steps:
- name: Checkout the docker build repo for legacy builds
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: fluent/fluent-bit-docker-image
ref: "1.8" # Fixed to this branch

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- id: debug-meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ env.IMAGE_NAME }}
tags: |
raw,${{ inputs.ref }}-debug
- name: Build the legacy x86_64 debug image
if: matrix.arch == 'amd64'
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
file: ./Dockerfile.x86_64.debug
context: .
Expand All @@ -95,14 +95,14 @@ jobs:
- name: Extract metadata from Github
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ env.IMAGE_NAME }}
tags: |
raw,${{ matrix.suffix }}-${{ inputs.ref }}
- name: Build the legacy ${{ matrix.arch }} image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
file: ./Dockerfile.${{ matrix.suffix }}
context: .
Expand All @@ -127,10 +127,10 @@ jobs:
- build-legacy-images-matrix
steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/call-build-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
contents: read
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

Expand Down Expand Up @@ -85,26 +85,26 @@ jobs:
debug-digest: ${{ steps.debug_build_push.outputs.digest }}
steps:
- name: Checkout code for modern style builds
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ inputs.registry }}
username: ${{ inputs.username }}
password: ${{ secrets.token }}

- name: Extract metadata from Github
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ inputs.registry }}/${{ inputs.image }}
tags: |
Expand All @@ -114,7 +114,7 @@ jobs:
- name: Build the production images
id: build_push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
file: ./dockerfiles/Dockerfile
context: .
Expand All @@ -131,7 +131,7 @@ jobs:
RELEASE_VERSION=${{ inputs.version }}
- id: debug-meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ inputs.registry }}/${{ inputs.image }}
tags: |
Expand All @@ -141,7 +141,7 @@ jobs:
- name: Build the debug multi-arch images
id: debug_build_push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
file: ./dockerfiles/Dockerfile
context: .
Expand All @@ -168,7 +168,7 @@ jobs:
packages: read
steps:
- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ inputs.registry }}
username: ${{ inputs.username }}
Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:
packages: read
steps:
- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ inputs.registry }}
username: ${{ inputs.username }}
Expand Down Expand Up @@ -297,12 +297,12 @@ jobs:
packages: write
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ inputs.registry }}
username: ${{ inputs.username }}
Expand All @@ -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@v4
# uses: docker/build-push-action@v5
# with:
# file: ./dockerfiles/Dockerfile.windows
# context: .
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/call-build-linux-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
contents: read
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
path: source
Expand All @@ -87,7 +87,7 @@ jobs:
# Pick up latest master version
- name: Checkout code for action
if: inputs.environment == 'staging'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: action-support

Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
continue-on-error: ${{ inputs.ignore_failing_targets || false }}
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

Expand All @@ -125,10 +125,10 @@ jobs:
uses: self-actuated/hub-mirror@master

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Replace all special characters with dashes
id: formatted_distro
Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:
# Pick up latest master version
- name: Checkout code for action
if: inputs.environment == 'staging'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: action-support

Expand Down Expand Up @@ -224,11 +224,11 @@ jobs:
sudo apt-get install -y createrepo-c aptly awscli
- name: Checkout code for repo metadata construction - always latest
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Import GPG key for signing
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v5
uses: crazy-max/ghaction-import-gpg@v6
with:
gpg_private_key: ${{ secrets.gpg_private_key }}
passphrase: ${{ secrets.gpg_private_key_passphrase }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/call-build-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
contents: read
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

Expand All @@ -72,7 +72,7 @@ jobs:
contents: read
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
contents: read
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/call-build-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
armSupported: ${{ steps.armcheck.outputs.armSupported }}
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
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;
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

Expand All @@ -113,7 +113,7 @@ jobs:
arch: ${{ matrix.config.arch }}

- name: Get gzip command w/ chocolatey
uses: crazy-max/ghaction-chocolatey@v2
uses: crazy-max/ghaction-chocolatey@v3
with:
args: install gzip -y

Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
contents: read
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# Need latest for checksum packaging script
ref: master
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/call-integration-image-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,30 +39,30 @@ jobs:
contents: read
packages: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ inputs.registry }}
username: ${{ inputs.username }}
password: ${{ secrets.token }}

- name: Extract metadata from Github
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ inputs.registry }}/${{ inputs.image }}
tags: |
raw,${{ inputs.image-tag }}
- name: Build the AMD64 image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
file: ./dockerfiles/Dockerfile
context: .
Expand Down Expand Up @@ -91,14 +91,14 @@ jobs:

- name: Extract metadata from Github
id: meta-debug
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ${{ inputs.registry }}/${{ inputs.image }}
tags: |
raw,${{ inputs.image-tag }}-debug
- name: Build the AMD64 debug image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
file: ./dockerfiles/Dockerfile
context: .
Expand All @@ -120,12 +120,12 @@ jobs:
packages: read
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ inputs.registry }}
username: ${{ inputs.username }}
Expand Down
Loading

0 comments on commit 6bfa55b

Please sign in to comment.