From f75d4f5f9f90187730229ab6f23dc9f536edd762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Wed, 15 Mar 2023 19:01:47 +0000
Subject: [PATCH] ci: update indent image to GNU indent 2.2.12

... and dotnet-sdk to 7.0.

Fixes #340

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4182>
---
 .gitlab-ci.yml              | 2 +-
 .gitlab-image-tags.yml      | 2 +-
 ci/docker/indent/prepare.sh | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc85fa95ea..07bb47512b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -141,7 +141,7 @@ fedora amd64 docker:
 
 .gst-indent image:
   variables:
-    FDO_DISTRIBUTION_VERSION: 'stretch'
+    FDO_DISTRIBUTION_VERSION: 'bookworm'
     FDO_REPO_SUFFIX: "$INDENT_AMD64_SUFFIX"
     FDO_DISTRIBUTION_TAG: "$INDENT_TAG-$GST_UPSTREAM_BRANCH"
     FDO_DISTRIBUTION_PACKAGES: 'curl indent git findutils'
diff --git a/.gitlab-image-tags.yml b/.gitlab-image-tags.yml
index d1312500d3..51af1876e3 100644
--- a/.gitlab-image-tags.yml
+++ b/.gitlab-image-tags.yml
@@ -6,6 +6,6 @@ variables:
   # to change any part of the string of the image you want.
   ###
   FEDORA_TAG:  '2022-12-10.0'
-  INDENT_TAG: '2022-03-07.1'
+  INDENT_TAG: '2023-03-16.1'
   LINT_TAG: '2023-02-16.5'
   WINDOWS_TAG: '2023-03-11.0'
diff --git a/ci/docker/indent/prepare.sh b/ci/docker/indent/prepare.sh
index b8c15042c1..a2ca626c62 100755
--- a/ci/docker/indent/prepare.sh
+++ b/ci/docker/indent/prepare.sh
@@ -5,11 +5,12 @@ apt update -yqq
 apt install -y gnupg apt-transport-https
 curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg
 mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/
-curl -O https://packages.microsoft.com/config/debian/9/prod.list
+# FIXME: this is bullseye, but image is actually bookworm (testing at the time)
+curl -O https://packages.microsoft.com/config/debian/11/prod.list
 mv prod.list /etc/apt/sources.list.d/microsoft-prod.list
 chown root:root /etc/apt/trusted.gpg.d/microsoft.asc.gpg
 chown root:root /etc/apt/sources.list.d/microsoft-prod.list
 apt update -yqq
-apt install -y dotnet-sdk-5.0
+apt install -y dotnet-sdk-7.0
 dotnet tool install --global dotnet-format
 ln -s ~/.dotnet/tools/dotnet-format /usr/local/bin/dotnet-format