Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

workflows: resolve ubuntu 24 packaging problems #9751

Merged
merged 2 commits into from
Dec 19, 2024
+5 −9
Merged

workflows: resolve ubuntu 24 packaging problems #9751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a302849
workflows: resolve ubuntu 24 packaging problems
patrick-stephens Dec 19, 2024
d6ac6b2
workflows: remove unavailable macOS 12 runners
patrick-stephens Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/call-build-linux-packages.yaml
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions .github/workflows/staging-release.yaml
View file
Open in desktop
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
Loading