From 70e827b1c6ce1ffddf0d39a8f3ae8019555604ec Mon Sep 17 00:00:00 2001 From: Patrick Stephens Date: Thu, 19 Dec 2024 14:22:41 +0000 Subject: [PATCH] workflows: resolve ubuntu 24 packaging problems Signed-off-by: Patrick Stephens --- .../workflows/call-build-linux-packages.yaml | 6 +-- .github/workflows/call-build-macos.yaml | 4 -- .github/workflows/staging-release.yaml | 49 +++++++++++++++---- 3 files changed, 42 insertions(+), 17 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/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 58d2660c935..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 @@ -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: @@ -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 @@ -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 }} @@ -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 @@ -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' @@ -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