Skip to content

Commit

Permalink
workflows: resolve ubuntu 24 packaging problems (#9752)
Browse files Browse the repository at this point in the history
Signed-off-by: Patrick Stephens <[email protected]>
  • Loading branch information
patrick-stephens authored Dec 19, 2024
1 parent d9db741 commit daff07c
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/call-build-linux-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
call-build-capture-source:
# Capture source tarball and generate checksum for it
name: Extract any supporting metadata
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
environment: ${{ inputs.environment }}
permissions:
contents: read
Expand Down Expand Up @@ -105,8 +105,8 @@ jobs:
call-build-linux-packages:
name: ${{ matrix.distro }} package build and stage to S3
environment: ${{ inputs.environment }}
# Ensure for OSS Fluent Bit repo we enable usage of Actuated runners for ARM builds, for forks it should keep existing ubuntu-latest usage.
runs-on: ${{ (contains(matrix.distro, 'arm' ) && (github.repository == 'fluent/fluent-bit') && 'actuated-arm64-8cpu-16gb') || 'ubuntu-latest' }}
# Ensure for OSS Fluent Bit repo we enable usage of Actuated runners for ARM builds, for forks it should keep existing ubuntu-22.04 usage.
runs-on: ${{ (contains(matrix.distro, 'arm' ) && (github.repository == 'fluent/fluent-bit') && 'actuated-arm64-8cpu-16gb') || 'ubuntu-22.04' }}
permissions:
contents: read
strategy:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/call-build-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ jobs:
fail-fast: false
matrix:
config:
- name: "Normal macOS-latest runner (Intel)"
runner: macos-12
- name: "Apple Silicon macOS runner"
runner: macos-14

Expand Down Expand Up @@ -121,8 +119,6 @@ jobs:
fail-fast: false
matrix:
config:
- name: "Normal macOS-latest package (Intel)"
os: macos-12
- name: "Apple Silicon macOS package"
os: macos-14

Expand Down
49 changes: 39 additions & 10 deletions .github/workflows/staging-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ jobs:

staging-release-apt-packages:
name: S3 - update APT packages bucket
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
environment: release
needs:
- staging-release-version-check
Expand Down Expand Up @@ -327,7 +327,7 @@ jobs:

staging-release-source-s3:
name: S3 - update source bucket
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
environment: release
needs:
- staging-release-version-check
Expand Down Expand Up @@ -502,8 +502,8 @@ jobs:
TAG: ${{ steps.get-tag.outputs.tag }}

staging-release-images-latest-tags:
# Only update latest tags for 3.1 releases
if: startsWith(github.event.inputs.version, '3.1')
# Only update latest tags for 3.2 releases
if: startsWith(github.event.inputs.version, '3.2')
name: Release latest Linux container images
runs-on: ubuntu-latest
needs:
Expand Down Expand Up @@ -803,9 +803,21 @@ jobs:
target_commitish: '3.0'
make_latest: false

- name: Release 3.1 and latest
- name: Release 3.1 - not latest
uses: softprops/action-gh-release@v2
if: startsWith(inputs.version, '3.1')
with:
body: "https://fluentbit.io/announcements/v${{ inputs.version }}/"
draft: false
generate_release_notes: true
name: "Fluent Bit ${{ inputs.version }}"
tag_name: v${{ inputs.version }}
target_commitish: '3.1'
make_latest: false

- name: Release 3.2 and latest
uses: softprops/action-gh-release@v2
if: startsWith(inputs.version, '3.2')
with:
body: "https://fluentbit.io/announcements/v${{ inputs.version }}/"
draft: false
Expand Down Expand Up @@ -903,11 +915,20 @@ jobs:
uses: actions/checkout@v4
with:
repository: fluent/fluent-bit-docs
ref: 3.0
token: ${{ secrets.GH_PA_TOKEN }}

- name: Release 3.1 and latest
- name: Release 3.1 - not latest
if: startsWith(inputs.version, '3.1')
uses: actions/checkout@v4
with:
repository: fluent/fluent-bit-docs
ref: 3.1
token: ${{ secrets.GH_PA_TOKEN }}

- name: Release 3.2 and latest
if: startsWith(inputs.version, '3.2')
uses: actions/checkout@v4
with:
repository: fluent/fluent-bit-docs
token: ${{ secrets.GH_PA_TOKEN }}
Expand Down Expand Up @@ -935,7 +956,7 @@ jobs:

- name: Raise docs PR
id: cpr
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
commit-message: 'release: update to v${{ inputs.version }}'
signoff: true
Expand Down Expand Up @@ -984,15 +1005,23 @@ jobs:
with:
ref: 2.2

- name: Release 3.0 not latest
- name: Release 3.0
if: startsWith(inputs.version, '3.0')
uses: actions/checkout@v4
with:
ref: 3.0

- name: Release 3.1 latest
- name: Release 3.1
if: startsWith(inputs.version, '3.1')
uses: actions/checkout@v4
with:
ref: 3.1

- name: Release 3.2
if: startsWith(inputs.version, '3.2')
uses: actions/checkout@v4
with:
ref: master

# Get the new version to use
- name: 'Get next minor version'
Expand All @@ -1011,7 +1040,7 @@ jobs:

- name: Raise FB PR to update version
id: cpr
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
commit-message: 'release: update to ${{ steps.semvers.outputs.patch }}'
signoff: true
Expand Down

0 comments on commit daff07c

Please sign in to comment.