Skip to content

Commit e12d4ef

Browse files
committed
ci: remove buildkit support
1 parent 3e7a3c3 commit e12d4ef

File tree

3 files changed

+10
-100
lines changed

3 files changed

+10
-100
lines changed

.travis.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
language: c
22
os: linux
33
dist: focal
4+
addons:
5+
apt:
6+
sources:
7+
- sourceline: 'deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable'
8+
packages:
9+
- docker-ce docker-ce-cli containerd.io docker-buildx-plugin
410
services:
511
- docker
612

@@ -59,11 +65,10 @@ before_install:
5965
- if [ -d "${HOME}/buildx-cache/.buildx-cache-${POLICY}_${PLATFORM}" ]; then cp -rlf ${HOME}/buildx-cache/.buildx-cache-${POLICY}_${PLATFORM} ./; fi
6066

6167
install:
62-
- uptime
63-
- nproc
64-
- free
65-
- cat /proc/cpuinfo
66-
- ./travisci-install-buildx.sh
68+
- docker version
69+
- docker buildx version
70+
- docker buildx create --name builder-manylinux --driver docker-container --use
71+
- docker buildx inspect --bootstrap --builder builder-manylinux 2>&1 | tee /dev/null
6772

6873
script: |
6974
BUILD_STATUS=success
@@ -88,7 +93,3 @@ deploy:
8893
on:
8994
branch: main
9095
repo: pypa/manylinux
91-
92-
after_script:
93-
- if [ -f ${HOME}/dockerd-rootless.pid ]; then kill -15 $(cat ${HOME}/dockerd-rootless.pid); fi
94-
- if [ -f /tmp/buildkitd.pid ]; then sudo kill -15 $(cat /tmp/buildkitd.pid); fi

build.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,6 @@ elif [ "${MANYLINUX_BUILD_FRONTEND}" == "docker-buildx" ]; then
9999
--cache-from=type=local,src=$(pwd)/.buildx-cache-${POLICY}_${PLATFORM} \
100100
--cache-to=type=local,dest=$(pwd)/.buildx-cache-staging-${POLICY}_${PLATFORM},mode=max \
101101
${BUILD_ARGS_COMMON}
102-
elif [ "${MANYLINUX_BUILD_FRONTEND}" == "buildkit" ]; then
103-
USE_LOCAL_CACHE=1
104-
buildctl build \
105-
--frontend=dockerfile.v0 \
106-
--local context=./docker/ \
107-
--local dockerfile=./docker/ \
108-
--import-cache type=local,src=$(pwd)/.buildx-cache-${POLICY}_${PLATFORM} \
109-
--export-cache type=local,dest=$(pwd)/.buildx-cache-staging-${POLICY}_${PLATFORM},mode=max \
110-
--opt build-arg:POLICY=${POLICY} --opt build-arg:PLATFORM=${PLATFORM} --opt build-arg:BASEIMAGE=${BASEIMAGE} \
111-
--opt "build-arg:DEVTOOLSET_ROOTPATH=${DEVTOOLSET_ROOTPATH}" --opt "build-arg:PREPEND_PATH=${PREPEND_PATH}" --opt "build-arg:LD_LIBRARY_PATH_ARG=${LD_LIBRARY_PATH_ARG}" \
112-
--output type=docker,name=quay.io/pypa/${POLICY}_${PLATFORM}:${COMMIT_SHA} | docker load
113102
else
114103
echo "Unsupported build frontend: '${MANYLINUX_BUILD_FRONTEND}'"
115104
exit 1

travisci-install-buildx.sh

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)