Skip to content

Commit 9be6263

Browse files
🙈 Bump to Hugo 0.143.0, build with min glibc 2.17, and fix s390x + ppc64le builds (#210)
* 🙈 Retry glibc 2.17 * 📈 Bump s390x and ppc64le wheels to glibc 2.28 * 🍓 Use newer images instead of pins * 🩸 Drop to Go 1.23.4 for s390x and ppc64le * 👊 Try Hugo 0.143.0 * 🚧 Bump to latest ppc64le and s390x images * 🚧 Go back to pinned images * 🤞🏻 Test temporary pin to new QEMU * 🚧 Avoid caching * ⏮️ Reinstate glibc 2.17 compatibility everywhere * 🤞🏻 Try Windows 2025 image for Windows i686
1 parent 82305b2 commit 9be6263

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

.github/workflows/cd.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ concurrency:
1414

1515
env:
1616
FORCE_COLOR: 3
17-
CIBW_BUILD_VERBOSITY: 2
1817
CIBW_BUILD_FRONTEND: "build"
1918
CIBW_BUILD: "cp312-*"
2019
CIBW_SKIP: "pp* *musllinux*"
21-
CIBW_MANYLINUX_X86_64_IMAGE: "manylinux_2_28"
22-
CIBW_MANYLINUX_AARCH64_IMAGE: "manylinux_2_28"
2320

2421
jobs:
2522
sdist:
@@ -86,6 +83,7 @@ jobs:
8683
- uses: mlugg/setup-zig@a67e68dc5c8281d9608136d3d7ca1b282213e4ac # v1.2.1
8784
with:
8885
version: 0.13.0
86+
use-cache: false
8987

9088
- name: Build binary distribution (wheel) on Windows (arm64)
9189
# We need to use cibuildwheel because it has experimental support for cross-compiling
@@ -114,7 +112,7 @@ jobs:
114112

115113
windows_i686_wheels:
116114
name: i686-windows
117-
runs-on: windows-latest
115+
runs-on: windows-2025
118116
steps:
119117
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
120118
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
@@ -125,6 +123,7 @@ jobs:
125123
- uses: mlugg/setup-zig@a67e68dc5c8281d9608136d3d7ca1b282213e4ac # v1.2.1
126124
with:
127125
version: 0.13.0
126+
use-cache: false
128127

129128
# Note: cibuildwheel will manage installing 32-bit Python on Windows. We
130129
# do not need to do that manually unless we use setup-python instead.
@@ -223,6 +222,10 @@ jobs:
223222
- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
224223
with:
225224
platforms: all
225+
# This should be temporary
226+
# xref https://github.com/docker/setup-qemu-action/issues/188
227+
# xref https://github.com/tonistiigi/binfmt/issues/215
228+
image: tonistiigi/binfmt:qemu-v8.1.5
226229

227230
- name: Build binary distribution (wheel) on Linux (s390x)
228231
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
@@ -232,7 +235,7 @@ jobs:
232235
env:
233236
CIBW_ARCHS_LINUX: s390x
234237
CIBW_BEFORE_ALL_LINUX: |
235-
tarball="go1.23.5.linux-s390x.tar.gz"
238+
tarball="go1.23.4.linux-s390x.tar.gz"
236239
curl -LJO https://golang.org/dl/$tarball
237240
mkdir $HOME/go_installed/
238241
tar -C $HOME/go_installed/ -xzf $tarball
@@ -259,6 +262,10 @@ jobs:
259262
- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
260263
with:
261264
platforms: all
265+
# This should be temporary
266+
# xref https://github.com/docker/setup-qemu-action/issues/188
267+
# xref https://github.com/tonistiigi/binfmt/issues/215
268+
image: tonistiigi/binfmt:qemu-v8.1.5
262269

263270
- name: Build binary distribution (wheel) on Linux (ppc64le)
264271
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
@@ -268,7 +275,7 @@ jobs:
268275
env:
269276
CIBW_ARCHS_LINUX: ppc64le
270277
CIBW_BEFORE_ALL_LINUX: |
271-
tarball="go1.23.5.linux-ppc64le.tar.gz"
278+
tarball="go1.23.4.linux-ppc64le.tar.gz"
272279
curl -LJO https://golang.org/dl/$tarball
273280
mkdir $HOME/go_installed/
274281
tar -C $HOME/go_installed/ -xzf $tarball

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ concurrency:
1313

1414
env:
1515
FORCE_COLOR: 3
16-
CIBW_BUILD_VERBOSITY: 2
1716
CIBW_SKIP: "pp* *musllinux*"
1817
CIBW_BUILD_FRONTEND: "build"
1918

@@ -79,8 +78,6 @@ jobs:
7978
experimental:
8079
needs: [style]
8180
name: zig-${{ matrix.runs-on }}-${{ matrix.architecture }}-python-${{ matrix.python-version }}
82-
env:
83-
CIBW_BUILD_VERBOSITY: 2
8481
runs-on: ${{ matrix.runs-on }}
8582
strategy:
8683
fail-fast: false
@@ -115,6 +112,7 @@ jobs:
115112
- uses: mlugg/setup-zig@a67e68dc5c8281d9608136d3d7ca1b282213e4ac # v1.2.1
116113
with:
117114
version: 0.13.0
115+
use-cache: false
118116

119117
- name: Restore Hugo builder cache
120118
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ A subset of the platforms supported by Hugo itself are supported by these wheels
124124
| ------------ | --------------- | -------------------------------------- |
125125
| macOS | x86_64 (Intel) | ✅ macOS 10.13 (High Sierra) and later |
126126
| macOS | arm64 (Silicon) | ✅ macOS 11.0 (Big Sur) and later |
127-
| Linux | amd64 | ✅ glibc 2.24 and later |
128-
| Linux | arm64 | ✅ glibc 2.24 and later |
127+
| Linux | amd64 | ✅ glibc 2.17 and later |
128+
| Linux | arm64 | ✅ glibc 2.17 and later |
129129
| Linux | s390x | ✅ glibc 2.17 and later |
130130
| Linux | ppc64le | ✅ glibc 2.17 and later |
131131
| Windows | x86_64 ||

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
# ------ Hugo build configuration and constants ------------------------------------
1515

16-
HUGO_VERSION = "0.142.0"
16+
HUGO_VERSION = "0.143.0"
1717
# The Go toolchain will download the tarball into the hugo_cache/ directory.
1818
# We will point the build command to that location to build Hugo from source
1919
HUGO_CACHE_DIR = "hugo_cache"

0 commit comments

Comments
 (0)