From e652d7fc85fd8175c1b9dc27ad0f05f7eeac7562 Mon Sep 17 00:00:00 2001 From: Luca Guerra Date: Fri, 13 Dec 2024 15:02:13 +0000 Subject: [PATCH] Revert "update(build): disable musl builds" This reverts commit 30df5738a5a49fd7160715a8667bd0e01663d0d4. Signed-off-by: Luca Guerra --- .github/workflows/ci.yml | 12 +++++------- .github/workflows/master.yaml | 12 +++++------- .github/workflows/release.yaml | 13 +++++-------- .github/workflows/reusable_build_packages.yaml | 6 ++---- .github/workflows/reusable_publish_packages.yaml | 8 +------- 5 files changed, 18 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d169f0b..b8391b65 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,16 +48,14 @@ jobs: test-dev-packages: needs: [fetch-version, build-dev-packages-sanitizers-x86_64] uses: ./.github/workflows/reusable_test_packages.yaml - # The musl build job is currently disabled because we link libelf dynamically and it is - # not possible to dynamically link with musl - # strategy: - # fail-fast: false - # matrix: - # static: ["static", ""] + strategy: + fail-fast: false + matrix: + static: ["static", ""] with: arch: x86_64 sanitizers: true - # static: ${{ matrix.static != '' && true || false }} + static: ${{ matrix.static != '' && true || false }} version: ${{ needs.fetch-version.outputs.version }} test-dev-packages-arm64: diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml index 2496aefc..b893cd2e 100644 --- a/.github/workflows/master.yaml +++ b/.github/workflows/master.yaml @@ -31,15 +31,13 @@ jobs: test-dev-packages: needs: [fetch-version, build-dev-packages] uses: ./.github/workflows/reusable_test_packages.yaml - # The musl build job is currently disabled because we link libelf dynamically and it is - # not possible to dynamically link with musl - # strategy: - # fail-fast: false - # matrix: - # static: ["static", ""] + strategy: + fail-fast: false + matrix: + static: ["static", ""] with: arch: x86_64 - # static: ${{ matrix.static != '' && true || false }} + static: ${{ matrix.static != '' && true || false }} version: ${{ needs.fetch-version.outputs.version }} test-dev-packages-arm64: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 30133788..21a7c470 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -69,16 +69,13 @@ jobs: test-packages: needs: [release-settings, build-packages] uses: ./.github/workflows/reusable_test_packages.yaml - - # The musl build job is currently disabled because we link libelf dynamically and it is - # not possible to dynamically link with musl - # strategy: - # fail-fast: false - # matrix: - # static: ["static", ""] + strategy: + fail-fast: false + matrix: + static: ["static", ""] with: arch: x86_64 - # static: ${{ matrix.static != '' && true || false }} + static: ${{ matrix.static != '' && true || false }} version: ${{ github.event.release.tag_name }} test-packages-arm64: diff --git a/.github/workflows/reusable_build_packages.yaml b/.github/workflows/reusable_build_packages.yaml index ac648412..7b1c567a 100644 --- a/.github/workflows/reusable_build_packages.yaml +++ b/.github/workflows/reusable_build_packages.yaml @@ -117,12 +117,10 @@ jobs: path: | ${{ github.workspace }}/build/falco-*.rpm - # The musl build job is currently disabled because we link libelf dynamically and it is - # not possible to dynamically link with musl + build-musl-package: # x86_64 only for now - # if: ${{ inputs.arch == 'x86_64' }} - if: false + if: ${{ inputs.arch == 'x86_64' }} runs-on: ubuntu-latest container: alpine:3.17 steps: diff --git a/.github/workflows/reusable_publish_packages.yaml b/.github/workflows/reusable_publish_packages.yaml index 1fb34d68..b408edd5 100644 --- a/.github/workflows/reusable_publish_packages.yaml +++ b/.github/workflows/reusable_publish_packages.yaml @@ -65,10 +65,7 @@ jobs: name: falco-${{ inputs.version }}-aarch64.tar.gz path: /tmp/falco-build-bin - # The musl build job is currently disabled because we link libelf dynamically and it is - # not possible to dynamically link with musl - name: Download static binary x86_64 - if: false uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 with: name: falco-${{ inputs.version }}-static-x86_64.tar.gz @@ -102,11 +99,8 @@ jobs: run: | ./scripts/publish-bin -f /tmp/falco-build-bin/falco-${{ inputs.version }}-x86_64.tar.gz -r bin${{ inputs.bucket_suffix }} -a x86_64 ./scripts/publish-bin -f /tmp/falco-build-bin/falco-${{ inputs.version }}-aarch64.tar.gz -r bin${{ inputs.bucket_suffix }} -a aarch64 - - # The musl build job is currently disabled because we link libelf dynamically and it is - # not possible to dynamically link with musl + - name: Publish static - if: false run: | ./scripts/publish-bin -f /tmp/falco-build-bin-static/falco-${{ inputs.version }}-static-x86_64.tar.gz -r bin${{ inputs.bucket_suffix }} -a x86_64