mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git
synced 2024-11-22 17:41:05 +00:00
ci: Update base image to debian 12 bookworm
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1234>
This commit is contained in:
parent
fe038b7a14
commit
368e1cacb6
3 changed files with 22 additions and 22 deletions
|
@ -17,7 +17,7 @@
|
||||||
# Updating the nightly image should be done by simply running a scheduled ci
|
# Updating the nightly image should be done by simply running a scheduled ci
|
||||||
# pipeline on the upstream repo with the $UPDATE_NIGHTLY variable defined.
|
# pipeline on the upstream repo with the $UPDATE_NIGHTLY variable defined.
|
||||||
|
|
||||||
.templates_sha: &templates_sha 567700e483aabed992d0a4fea84994a0472deff6
|
.templates_sha: &templates_sha fddab8aa63e89a8e65214f59860d9c0f030360c9
|
||||||
|
|
||||||
include:
|
include:
|
||||||
- project: 'freedesktop/ci-templates'
|
- project: 'freedesktop/ci-templates'
|
||||||
|
@ -89,10 +89,10 @@ trigger:
|
||||||
when: 'manual'
|
when: 'manual'
|
||||||
allow_failure: false
|
allow_failure: false
|
||||||
|
|
||||||
.debian:11:
|
.debian:12:
|
||||||
needs: []
|
needs: []
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_VERSION: 'bullseye-slim'
|
FDO_DISTRIBUTION_VERSION: 'bookworm-slim'
|
||||||
before_script:
|
before_script:
|
||||||
- source ./ci/env.sh
|
- source ./ci/env.sh
|
||||||
- mkdir .cargo && echo -e "[net]\ngit-fetch-with-cli = true" > .cargo/config
|
- mkdir .cargo && echo -e "[net]\ngit-fetch-with-cli = true" > .cargo/config
|
||||||
|
@ -104,26 +104,26 @@ trigger:
|
||||||
cargo update --color=always
|
cargo update --color=always
|
||||||
fi
|
fi
|
||||||
|
|
||||||
.debian:11-base:
|
.debian:12-base:
|
||||||
extends: .debian:11
|
extends: .debian:12
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_TAG: 'base-$GST_RS_IMG_TAG'
|
FDO_DISTRIBUTION_TAG: 'base-$GST_RS_IMG_TAG'
|
||||||
|
|
||||||
.debian:11-stable:
|
.debian:12-stable:
|
||||||
extends: .debian:11
|
extends: .debian:12
|
||||||
variables:
|
variables:
|
||||||
RUST_IMAGE_FULL: "1"
|
RUST_IMAGE_FULL: "1"
|
||||||
FDO_DISTRIBUTION_TAG: '$GST_RS_STABLE-$GST_RS_IMG_TAG'
|
FDO_DISTRIBUTION_TAG: '$GST_RS_STABLE-$GST_RS_IMG_TAG'
|
||||||
FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh $GST_RS_STABLE $RUST_IMAGE_FULL'
|
FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh $GST_RS_STABLE $RUST_IMAGE_FULL'
|
||||||
|
|
||||||
.debian:11-msrv:
|
.debian:12-msrv:
|
||||||
extends: .debian:11
|
extends: .debian:12
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_TAG: '$GST_RS_MSRV-$GST_RS_IMG_TAG'
|
FDO_DISTRIBUTION_TAG: '$GST_RS_MSRV-$GST_RS_IMG_TAG'
|
||||||
FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh $GST_RS_MSRV $RUST_IMAGE_FULL'
|
FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh $GST_RS_MSRV $RUST_IMAGE_FULL'
|
||||||
|
|
||||||
.debian:11-nightly:
|
.debian:12-nightly:
|
||||||
extends: .debian:11
|
extends: .debian:12
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_TAG: 'nightly-$GST_RS_IMG_TAG'
|
FDO_DISTRIBUTION_TAG: 'nightly-$GST_RS_IMG_TAG'
|
||||||
FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh nightly $RUST_IMAGE_FULL'
|
FDO_DISTRIBUTION_EXEC: 'bash ci/install-rust.sh nightly $RUST_IMAGE_FULL'
|
||||||
|
@ -145,37 +145,37 @@ trigger:
|
||||||
FDO_DISTRIBUTION_EXEC: >-
|
FDO_DISTRIBUTION_EXEC: >-
|
||||||
bash ci/install-gst.sh &&
|
bash ci/install-gst.sh &&
|
||||||
bash ci/install-gtk4.sh &&
|
bash ci/install-gtk4.sh &&
|
||||||
pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates
|
pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates
|
||||||
|
|
||||||
.build-final-image:
|
.build-final-image:
|
||||||
extends:
|
extends:
|
||||||
- .fdo.container-build@debian
|
- .fdo.container-build@debian
|
||||||
stage: container-final
|
stage: container-final
|
||||||
variables:
|
variables:
|
||||||
FDO_BASE_IMAGE: '$CI_REGISTRY_IMAGE/debian/bullseye-slim:base-$GST_RS_IMG_TAG'
|
FDO_BASE_IMAGE: '$CI_REGISTRY_IMAGE/debian/bookworm-slim:base-$GST_RS_IMG_TAG'
|
||||||
|
|
||||||
build-base:
|
build-base:
|
||||||
extends:
|
extends:
|
||||||
- .build-base-image
|
- .build-base-image
|
||||||
- .debian:11-base
|
- .debian:12-base
|
||||||
|
|
||||||
build-stable:
|
build-stable:
|
||||||
needs: ["build-base"]
|
needs: ["build-base"]
|
||||||
extends:
|
extends:
|
||||||
- .build-final-image
|
- .build-final-image
|
||||||
- .debian:11-stable
|
- .debian:12-stable
|
||||||
|
|
||||||
build-msrv:
|
build-msrv:
|
||||||
needs: ["build-base"]
|
needs: ["build-base"]
|
||||||
extends:
|
extends:
|
||||||
- .build-final-image
|
- .build-final-image
|
||||||
- .debian:11-msrv
|
- .debian:12-msrv
|
||||||
|
|
||||||
build-nightly:
|
build-nightly:
|
||||||
needs: ["build-base"]
|
needs: ["build-base"]
|
||||||
extends:
|
extends:
|
||||||
- .build-final-image
|
- .build-final-image
|
||||||
- .debian:11-nightly
|
- .debian:12-nightly
|
||||||
|
|
||||||
update-nightly:
|
update-nightly:
|
||||||
extends: build-nightly
|
extends: build-nightly
|
||||||
|
@ -192,17 +192,17 @@ update-nightly:
|
||||||
|
|
||||||
.img-stable:
|
.img-stable:
|
||||||
extends:
|
extends:
|
||||||
- .debian:11-stable
|
- .debian:12-stable
|
||||||
- .dist-debian-container
|
- .dist-debian-container
|
||||||
|
|
||||||
.img-msrv:
|
.img-msrv:
|
||||||
extends:
|
extends:
|
||||||
- .debian:11-msrv
|
- .debian:12-msrv
|
||||||
- .dist-debian-container
|
- .dist-debian-container
|
||||||
|
|
||||||
.img-nightly:
|
.img-nightly:
|
||||||
extends:
|
extends:
|
||||||
- .debian:11-nightly
|
- .debian:12-nightly
|
||||||
- .dist-debian-container
|
- .dist-debian-container
|
||||||
|
|
||||||
# GST_PLUGINS_RS_TOKEN is a variable of type 'Var' defined in gstreamer-rs CI
|
# GST_PLUGINS_RS_TOKEN is a variable of type 'Var' defined in gstreamer-rs CI
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
variables:
|
variables:
|
||||||
GST_RS_IMG_TAG: '2023-03-09.0'
|
GST_RS_IMG_TAG: '2023-03-09.1-bookworm'
|
||||||
GST_RS_STABLE: '1.68.0'
|
GST_RS_STABLE: '1.68.0'
|
||||||
GST_RS_MSRV: '1.66.0'
|
GST_RS_MSRV: '1.66.0'
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
pip3 install meson==1.0.1
|
pip3 install meson==1.0.1 --break-system-packages
|
||||||
|
|
||||||
# gstreamer-rs already has a 'gstreamer' directory so don't clone there
|
# gstreamer-rs already has a 'gstreamer' directory so don't clone there
|
||||||
pushd .
|
pushd .
|
||||||
|
|
Loading…
Reference in a new issue