Skip to content

Commit 3580d98

Browse files
committed
.github: drop old scripted driver builds
Instead of the script driven linear driver build, we now have parallelized MPBT based build up and running - so let's drop the old one. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
1 parent 87e538a commit 3580d98

2 files changed

Lines changed: 1 addition & 118 deletions

File tree

.github/scripts/compile-drivers.sh

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

.github/workflows/build-xserver.yml

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -62,57 +62,6 @@ jobs:
6262
__BUILD/meson-logs/*
6363
__BUILD/test/piglit-results/*
6464
65-
drivers-build-ubuntu:
66-
env:
67-
MESON_ARGS: -Dprefix=/usr -Dxorg-sdk=true -Dxorg=false -Dxephyr=false -Dwerror=false -Dxcsecurity=false -Dxorg=true -Dxvfb=false -Dxnest=false -Dxfbdev=false
68-
runs-on: ubuntu-latest
69-
steps:
70-
- name: Check out repository code
71-
uses: actions/checkout@v4
72-
73-
- name: prepare build environment
74-
run: |
75-
MACHINE=`gcc -dumpmachine`
76-
echo "MACHINE=$MACHINE" >> "$GITHUB_ENV"
77-
echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/$MACHINE/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV"
78-
sudo chown root /bin/tar && sudo chmod u+s /bin/tar
79-
80-
- name: apt cache
81-
uses: actions/cache@v4
82-
with:
83-
path: /var/cache/apt
84-
key: apt-cache-${{ hashFiles('.github/scripts/ubuntu/install-pkg.sh') }}
85-
restore-keys: apt-cache-
86-
87-
- name: pkg install
88-
run: sudo .github/scripts/ubuntu/install-pkg.sh
89-
90-
- name: X11 prereq cache
91-
uses: actions/cache@v4
92-
with:
93-
path: |
94-
${{ env.X11_PREFIX }}
95-
${{ env.X11_BUILD_DIR }}/xts
96-
${{ env.X11_BUILD_DIR }}/piglit
97-
key: ${{ runner.name }}-x11-deps-${{ hashFiles('.github/scripts/install-prereq.sh') }}
98-
restore-keys: ${{ runner.name }}-x11-deps-
99-
100-
- name: generic prereq
101-
run: .github/scripts/install-prereq-drivers.sh
102-
103-
- name: build xserver sdk
104-
run: |
105-
echo -n > .meson_environment
106-
echo "export MESON_BUILDDIR=$MESON_BUILDDIR" >> .meson_environment
107-
echo "export PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> .meson_environment
108-
.github/scripts/meson-build.sh --skip-test
109-
sudo meson install --no-rebuild -C "$MESON_BUILDDIR"
110-
sudo mkdir -p /usr/local/lib/$MACHINE/xorg/modules # /home/runner/x11/lib/xorg/modules
111-
sudo chown -R runner /usr/local/lib/$MACHINE/xorg/modules # /home/runner/x11/lib/xorg/modules
112-
113-
- name: compile drivers
114-
run: .github/scripts/compile-drivers.sh
115-
11665
xserver-build-mingw32-ubuntu:
11766
runs-on: ubuntu-latest
11867
env:
@@ -336,7 +285,7 @@ jobs:
336285
if: ${{ startsWith(github.ref, 'refs/tags/xlibre-xserver-') }}
337286
needs:
338287
- xserver-build-ubuntu
339-
- drivers-build-ubuntu
288+
- xserver-and-drivers-mpbt
340289
- xserver-build-mingw32-ubuntu
341290
- xserver-build-macos
342291
- xserver-build-freebsd

0 commit comments

Comments
 (0)