diff options
Diffstat (limited to '.gitlab-ci/ci.template')
-rw-r--r-- | .gitlab-ci/ci.template | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 32e8a341..3a5f30db 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -69,9 +69,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 @@ -253,7 +253,7 @@ check-merge-request: - 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 |