xf86-video-amdgpu: Branch 'master' - 2 commits

[GitLab Mirror]

 .gitlab-ci.yml               |    5 +++--
 .gitlab-ci/debian-install.sh |    4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit d1c7ab5bac11c2a6c6c763778caecc318318fe12
Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Fri Jul 12 18:46:56 2024 +0200

    ci: use gfx-ci/ci-deb-repo to get latest libdrm
    
    Reviewed-by: Marek Olšák <marek.olsak at amd.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd10cc1..8389500 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,8 @@ stages:
     FDO_DISTRIBUTION_VERSION: bookworm-slim
     FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/debian-install.sh'
     FDO_DISTRIBUTION_PACKAGES: 'ca-certificates'
-    FDO_DISTRIBUTION_TAG: "2024-02-24"
+    FDO_DISTRIBUTION_TAG: "2024-07-12-ci-deb-repo"
+    PKG_REPO_REV: "bca9635d"
 
 container-build:
   extends:
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 5536488..93934c8 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -4,6 +4,8 @@ set -e
 set -o xtrace
 
 echo 'deb-src https://deb.debian.org/debian bookworm main' >/etc/apt/sources.list.d/deb-src.list
+echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list
+
 apt-get update
 apt-get install -y git ca-certificates build-essential automake autoconf libtool pkg-config
 
commit 7c943d5a024182e45aa241c47ef85ea39e0f1383
Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Fri Jul 12 18:55:17 2024 +0200

    ci: switch from testing to bookworm
    
    To be able to use gfx-ci/ci-deb-repo.
    
    Reviewed-by: Marek Olšák <marek.olsak at amd.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87d166d..fd10cc1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ stages:
 
 .debian-testing:
   variables:
-    FDO_DISTRIBUTION_VERSION: testing-slim
+    FDO_DISTRIBUTION_VERSION: bookworm-slim
     FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/debian-install.sh'
     FDO_DISTRIBUTION_PACKAGES: 'ca-certificates'
     FDO_DISTRIBUTION_TAG: "2024-02-24"
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index ddb3c57..5536488 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -3,7 +3,7 @@
 set -e
 set -o xtrace
 
-echo 'deb-src https://deb.debian.org/debian testing main' >/etc/apt/sources.list.d/deb-src.list
+echo 'deb-src https://deb.debian.org/debian bookworm main' >/etc/apt/sources.list.d/deb-src.list
 apt-get update
 apt-get install -y git ca-certificates build-essential automake autoconf libtool pkg-config