From afc9ffda858459495c454169dd6fbc09ad44fe1a Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Fri, 13 Mar 2026 19:24:26 +0100 Subject: [PATCH] chore: bump version to 4.4.25 and fix CGO_CFLAGS for cross-compilation Update version to 4.4.25 in version.txt and pkg/obioptions/version.go. Fix CGO_CFLAGS in release.yml by replacing generic '-I/usr/include' with architecture-specific paths (x86_64-linux-gnu and aarch64-linux-gnu) to ensure correct header inclusion during cross-compilation on Linux. --- .github/workflows/release.yml | 4 +++- pkg/obioptions/version.go | 2 +- version.txt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bccfd4c..3f81c8a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,10 +32,12 @@ jobs: goos: linux goarch: amd64 output_name: linux_amd64 + cgo_cflags: "-I/usr/include/x86_64-linux-gnu -I/usr/include" - os: ubuntu-24.04-arm goos: linux goarch: arm64 output_name: linux_arm64 + cgo_cflags: "-I/usr/include/aarch64-linux-gnu -I/usr/include" - os: macos-15-intel goos: darwin goarch: amd64 @@ -81,7 +83,7 @@ jobs: GOARCH: ${{ matrix.goarch }} VERSION: ${{ steps.get_version.outputs.version }} CC: ${{ matrix.goos == 'linux' && 'musl-gcc' || '' }} - CGO_CFLAGS: ${{ matrix.goos == 'linux' && '-I/usr/include' || '' }} + CGO_CFLAGS: ${{ matrix.cgo_cflags || '' }} run: | if [ "$GOOS" = "linux" ]; then make LDFLAGS='-linkmode=external -extldflags=-static' obitools diff --git a/pkg/obioptions/version.go b/pkg/obioptions/version.go index dc3b563..b681e24 100644 --- a/pkg/obioptions/version.go +++ b/pkg/obioptions/version.go @@ -3,7 +3,7 @@ package obioptions // Version is automatically updated by the Makefile from version.txt // The patch number (third digit) is incremented on each push to the repository -var _Version = "Release 4.4.24" +var _Version = "Release 4.4.25" // Version returns the version of the obitools package. // diff --git a/version.txt b/version.txt index 0233b3c..a9f8645 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -4.4.24 +4.4.25