Skip to content

Commit df3c3be

Browse files
author
Pat
authored
workflows: resolve ubuntu 24 packaging problems (#9751)
* workflows: resolve ubuntu 24 packaging problems Signed-off-by: Patrick Stephens <[email protected]> * workflows: remove unavailable macOS 12 runners Signed-off-by: Patrick Stephens <[email protected]> --------- Signed-off-by: Patrick Stephens <[email protected]>
1 parent addf261 commit df3c3be

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
call-build-capture-source:
5555
# Capture source tarball and generate checksum for it
5656
name: Extract any supporting metadata
57-
runs-on: ubuntu-latest
57+
runs-on: ubuntu-22.04
5858
environment: ${{ inputs.environment }}
5959
permissions:
6060
contents: read
@@ -105,8 +105,8 @@ jobs:
105105
call-build-linux-packages:
106106
name: ${{ matrix.distro }} package build and stage to S3
107107
environment: ${{ inputs.environment }}
108-
# Ensure for OSS Fluent Bit repo we enable usage of Actuated runners for ARM builds, for forks it should keep existing ubuntu-latest usage.
109-
runs-on: ${{ (contains(matrix.distro, 'arm' ) && (github.repository == 'fluent/fluent-bit') && 'actuated-arm64-8cpu-16gb') || 'ubuntu-latest' }}
108+
# 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.
109+
runs-on: ${{ (contains(matrix.distro, 'arm' ) && (github.repository == 'fluent/fluent-bit') && 'actuated-arm64-8cpu-16gb') || 'ubuntu-22.04' }}
110110
permissions:
111111
contents: read
112112
strategy:

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ jobs:
7474
fail-fast: false
7575
matrix:
7676
config:
77-
- name: "Normal macOS-latest runner (Intel)"
78-
runner: macos-12
7977
- name: "Apple Silicon macOS runner"
8078
runner: macos-14
8179

@@ -121,8 +119,6 @@ jobs:
121119
fail-fast: false
122120
matrix:
123121
config:
124-
- name: "Normal macOS-latest package (Intel)"
125-
os: macos-12
126122
- name: "Apple Silicon macOS package"
127123
os: macos-14
128124

.github/workflows/staging-release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172

173173
staging-release-apt-packages:
174174
name: S3 - update APT packages bucket
175-
runs-on: ubuntu-latest
175+
runs-on: ubuntu-22.04
176176
environment: release
177177
needs:
178178
- staging-release-version-check
@@ -327,7 +327,7 @@ jobs:
327327

328328
staging-release-source-s3:
329329
name: S3 - update source bucket
330-
runs-on: ubuntu-latest
330+
runs-on: ubuntu-22.04
331331
environment: release
332332
needs:
333333
- staging-release-version-check

0 commit comments

Comments
 (0)