diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-11-11 11:18:30 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-11-12 09:31:37 +1000 |
| commit | 05df169d2d3f5a68a07fc07a89c9cf027bdd1cff (patch) | |
| tree | 65f3ad72ffebfc0feda7333f4b737014fc7382c5 /.gitlab-ci.yml | |
| parent | b2dbe19605bf3a39ee19cd0c9a684b0e633e30fb (diff) | |
| download | libinput-05df169d2d3f5a68a07fc07a89c9cf027bdd1cff.tar.gz | |
gitlab CI: rename FREEBSD_PKGS to FREEBSD_PACKAGES for consistency
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e118b78b..c0017075 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,9 +79,9 @@ variables: DEBIAN_PACKAGES: 'git gcc g++ pkg-config meson check libudev-dev libevdev-dev doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx-rtd-theme python3-pytest-xdist libwacom-dev libcairo2-dev libgtk-3-dev libglib2.0-dev libmtdev-dev' UBUNTU_PACKAGES: 'git gcc g++ pkg-config meson check libudev-dev libevdev-dev doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx-rtd-theme python3-pytest-xdist libwacom-dev libcairo2-dev libgtk-3-dev libglib2.0-dev libmtdev-dev' ARCH_PACKAGES: 'git gcc pkgconfig meson check libsystemd libevdev doxygen graphviz python-sphinx python-recommonmark python-sphinx_rtd_theme python-pytest-xdist libwacom gtk3 mtdev diffutils' - FREEBSD_BUILD_PKGS: 'meson' - FREEBSD_PKGS: 'libepoll-shim libudev-devd libevdev libwacom gtk3 libmtdev ' ALPINE_PACKAGES: 'git gcc build-base pkgconfig meson check-dev eudev-dev libevdev-dev libwacom-dev cairo-dev gtk+3.0-dev mtdev-dev bash' + FREEBSD_BUILD_PKGS: 'meson' + FREEBSD_PACKAGES: 'libepoll-shim libudev-devd libevdev libwacom gtk3 libmtdev ' ############################ end of package lists ############################# # these tags should be updated each time the list of packages is updated @@ -306,7 +306,7 @@ alpine:latest@container-prep: - buildcntr=$(buildah from --quiet myfreeweb/freebsd-cross:latest) - $BUILDAH_RUN $buildcntr apk add --no-cache $FREEBSD_BUILD_PKGS - $BUILDAH_RUN $buildcntr pkg -r /freebsd update -f - - $BUILDAH_RUN $buildcntr pkg -r /freebsd install -y $FREEBSD_PKGS + - $BUILDAH_RUN $buildcntr pkg -r /freebsd install -y $FREEBSD_PACKAGES - buildah config --workingdir /app $buildcntr # tag the current container - $BUILDAH_COMMIT $buildcntr $FREEBSD_CONTAINER_IMAGE |