From 841835391e6bb6a5cfc33afa37455f3070147cbb Mon Sep 17 00:00:00 2001 From: Pat Date: Thu, 19 Dec 2024 12:53:53 +0000 Subject: [PATCH] workflows: resolve ubuntu 24 packaging problems (#9751) * workflows: resolve ubuntu 24 packaging problems Signed-off-by: Patrick Stephens * workflows: remove unavailable macOS 12 runners Signed-off-by: Patrick Stephens --------- Signed-off-by: Patrick Stephens --- .github/workflows/call-build-linux-packages.yaml | 4 ++-- .github/workflows/call-build-macos.yaml | 4 ---- .github/workflows/staging-release.yaml | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/call-build-linux-packages.yaml b/.github/workflows/call-build-linux-packages.yaml index 76ae12db615..5fb38b14866 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,7 +105,7 @@ 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 usage. + # 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 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 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