diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3f81c8a..162776f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: "1.23" + go-version: "1.26" - name: Checkout obitools4 project uses: actions/checkout@v4 - name: Run tests @@ -32,12 +32,10 @@ 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 @@ -56,7 +54,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: "1.23" + go-version: "1.26" - name: Extract version from tag id: get_version @@ -64,12 +62,6 @@ jobs: TAG=${GITHUB_REF#refs/tags/Release_} echo "version=$TAG" >> $GITHUB_OUTPUT - - name: Install build tools (Linux) - if: runner.os == 'Linux' - run: | - sudo apt-get update -q - sudo apt-get install -y musl-tools zlib1g-dev - - name: Install build tools (macOS) if: runner.os == 'macOS' run: | @@ -77,21 +69,30 @@ jobs: xcode-select --install 2>/dev/null || true xcode-select -p - - name: Build binaries + - name: Build binaries (Linux) + if: runner.os == 'Linux' + env: + VERSION: ${{ steps.get_version.outputs.version }} + run: | + docker run --rm \ + -v "$(pwd):/src" \ + -w /src \ + -e VERSION="${VERSION}" \ + golang:1.26-alpine \ + sh -c "apk add --no-cache gcc musl-dev zlib-dev make && \ + make LDFLAGS='-linkmode=external -extldflags=-static' obitools" + mkdir -p artifacts + tar -czf artifacts/obitools4_${VERSION}_${{ matrix.output_name }}.tar.gz -C build . + + - name: Build binaries (macOS) + if: runner.os == 'macOS' env: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} VERSION: ${{ steps.get_version.outputs.version }} - CC: ${{ matrix.goos == 'linux' && 'musl-gcc' || '' }} - CGO_CFLAGS: ${{ matrix.cgo_cflags || '' }} run: | - if [ "$GOOS" = "linux" ]; then - make LDFLAGS='-linkmode=external -extldflags=-static' obitools - else - make obitools - fi + make obitools mkdir -p artifacts - # Create a single tar.gz with all binaries for this platform tar -czf artifacts/obitools4_${VERSION}_${{ matrix.output_name }}.tar.gz -C build . - name: Upload artifacts diff --git a/logs_60535302930.zip b/logs_60535302930.zip new file mode 100644 index 0000000..8d691b3 Binary files /dev/null and b/logs_60535302930.zip differ diff --git a/pkg/obioptions/version.go b/pkg/obioptions/version.go index b681e24..88d8fe8 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.25" +var _Version = "Release 4.4.26" // Version returns the version of the obitools package. // diff --git a/version.txt b/version.txt index a9f8645..c92e911 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -4.4.25 +4.4.26