From a3028491042d74b7dbd1d7447b4304015fcda3f5 Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Thu, 19 Dec 2024 11:43:12 +0000 Subject: [PATCH 1/2] workflows: resolve ubuntu 24 packaging problems Signed-off-by: Patrick Stephens --- .github/workflows/call-build-linux-packages.yaml | 6 +++--- .github/workflows/staging-release.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/call-build-linux-packages.yaml b/.github/workflows/call-build-linux-packages.yaml index 7a79b382d32..c4261046b5a 100644 --- a/.github/workflows/call-build-linux-packages.yaml +++ b/.github/workflows/call-build-linux-packages.yaml @@ -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 @@ -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: diff --git a/.github/workflows/staging-release.yaml b/.github/workflows/staging-release.yaml index b306dad4d18..acb30eb4012 100644 --- a/.github/workflows/staging-release.yaml +++ b/.github/workflows/staging-release.yaml @@ -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 @@ -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 From d6ac6b247130cf993368da3cd58092d9bc21df01 Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Thu, 19 Dec 2024 12:50:11 +0000 Subject: [PATCH 2/2] workflows: remove unavailable macOS 12 runners Signed-off-by: Patrick Stephens --- .github/workflows/call-build-macos.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/call-build-macos.yaml b/.github/workflows/call-build-macos.yaml index 5aa8f5f8cf7..9a81f325ac0 100644 --- a/.github/workflows/call-build-macos.yaml +++ b/.github/workflows/call-build-macos.yaml @@ -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 @@ -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