Skip to content

Commit b04723f

Browse files
committed
Switch release builds to manylinux 2.28
1 parent cec13c0 commit b04723f

3 files changed

Lines changed: 28 additions & 36 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ docker-release-launch: docker-release
194194
docker run --network=host -v /:/host -v $(shell pwd):/app -v $(HOME)/.cache:/root/.cache --shm-size=4gb -it $(PROJECT_NAME)-release:$(DOCKER_TAG) zsh
195195

196196
pypi-wheel: auditwheel-install bazel-release
197-
ls dist/*.whl -Art | tail -n 1 | xargs auditwheel repair --plat manylinux_2_24_x86_64
197+
ls dist/*.whl -Art | tail -n 1 | xargs auditwheel repair --plat manylinux_2_28_x86_64
198198

199199
release-test1:
200200
cd envpool && python3 make_test.py

docker/release.dockerfile

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,28 @@
1-
FROM nvidia/cuda:13.1.1-cudnn-devel-ubuntu24.04
1+
FROM quay.io/pypa/manylinux_2_28_x86_64
22

33
ARG DEBIAN_FRONTEND=noninteractive
44
ARG HOME=/root
5-
ENV PYENV_ROOT=$HOME/.pyenv
6-
ENV PATH=$HOME/go/bin:$HOME/.pyenv/shims:$HOME/.pyenv/bin:$PATH
5+
ENV PATH=$HOME/go/bin:$PATH
76
ENV USE_BAZEL_VERSION=8.6.0
87

98
WORKDIR $HOME
109

11-
RUN apt-get update \
12-
&& apt-get install -y git curl wget zsh gcc g++ build-essential make tmux \
13-
python3-pip python3-dev python-is-python3 golang-go \
14-
swig zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev libncurses-dev libffi-dev liblzma-dev \
15-
llvm xz-utils tk-dev libxml2-dev libxmlsec1-dev libssl-dev qtbase5-dev qtdeclarative5-dev \
16-
&& rm -rf /var/lib/apt/lists/*
17-
RUN ln -sf /usr/include/x86_64-linux-gnu/qt5 /usr/include/qt
18-
RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
19-
WORKDIR $HOME
20-
RUN git clone https://github.com/gpakosz/.tmux.git
21-
RUN ln -s -f .tmux/.tmux.conf
22-
RUN cp .tmux/.tmux.conf.local .
23-
RUN echo "set-option -g default-shell /bin/zsh" >> .tmux.conf.local
24-
RUN echo "set-option -g history-limit 10000" >> .tmux.conf.local
25-
26-
RUN curl https://pyenv.run | sh
10+
RUN dnf install -y \
11+
git curl wget zsh gcc gcc-c++ make tmux golang java-17-openjdk-devel \
12+
qt5-qtbase-devel qt5-qtdeclarative-devel \
13+
&& dnf clean all
14+
RUN ln -sf "$(qmake-qt5 -query QT_INSTALL_HEADERS)" /usr/include/qt
2715

2816
RUN go install github.com/bazelbuild/bazelisk@latest && ln -sf $HOME/go/bin/bazelisk $HOME/go/bin/bazel
2917

3018
RUN bazel version
3119

32-
# install python
33-
34-
RUN echo 'export PYENV_ROOT="$HOME/.pyenv"' >> /etc/profile
35-
RUN echo 'command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"' >> /etc/profile
36-
RUN echo 'eval "$(pyenv init -)"' >> /etc/profile
37-
38-
RUN pyenv install -v 3.11-dev
39-
RUN pyenv install -v 3.12-dev
40-
RUN pyenv install -v 3.13-dev
41-
4220
WORKDIR /__w/envpool/envpool
4321
COPY . .
4422

4523
# cache bazel build (cpp only)
4624

47-
RUN bazel build //envpool/utils:image_process_test --config=release
48-
RUN bazel build //envpool/vizdoom/bin:vizdoom_bin --config=release
25+
RUN PATH=/opt/python/cp311-cp311/bin:$PATH bazel build //envpool/utils:image_process_test --config=release
26+
RUN PATH=/opt/python/cp311-cp311/bin:$PATH bazel build //envpool/vizdoom/bin:vizdoom_bin --config=release
4927

5028
WORKDIR /app
Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,31 @@ on:
1111
jobs:
1212
release:
1313
runs-on: ubuntu-latest
14-
container: trinkle23897/envpool-release:2023-01-02-5f1a5fd
14+
container: quay.io/pypa/manylinux_2_28_x86_64
1515
strategy:
1616
matrix:
1717
python-version: ["3.11", "3.12", "3.13"]
1818
steps:
1919
- uses: actions/checkout@v3
20+
- name: Install build dependencies
21+
run: |
22+
dnf install -y git curl wget zsh gcc gcc-c++ make tmux golang java-17-openjdk-devel qt5-qtbase-devel qt5-qtdeclarative-devel
23+
dnf clean all
24+
ln -sf "$(qmake-qt5 -query QT_INSTALL_HEADERS)" /usr/include/qt
25+
go install github.com/bazelbuild/bazelisk@latest
26+
ln -sf /root/go/bin/bazelisk /usr/local/bin/bazelisk
27+
ln -sf /root/go/bin/bazelisk /usr/local/bin/bazel
2028
- name: Set up Python ${{ matrix.python-version }}
29+
shell: bash
2130
run: |
22-
ln -sf /root/.cache $HOME/.cache
23-
ln -sf /root/.pyenv $HOME/.pyenv
24-
pyenv global ${{ matrix.python-version }}-dev
31+
case "${{ matrix.python-version }}" in
32+
3.11) PYBIN=/opt/python/cp311-cp311/bin ;;
33+
3.12) PYBIN=/opt/python/cp312-cp312/bin ;;
34+
3.13) PYBIN=/opt/python/cp313-cp313/bin ;;
35+
*) echo "unsupported python version: ${{ matrix.python-version }}" >&2; exit 1 ;;
36+
esac
37+
echo "$PYBIN" >> "$GITHUB_PATH"
38+
"$PYBIN/python3" --version
2539
- name: Build
2640
run: |
2741
make pypi-wheel

0 commit comments

Comments
 (0)