[igt-dev] [PATCH v2 03/12] ci: Move files to ci/ subdir
Tomeu Vizoso
tomeu.vizoso at collabora.com
Thu Mar 10 07:37:51 UTC 2022
We will be adding a few more files soon.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
---
.gitlab-ci.yml | 12 ++++++------
Dockerfile => ci/Dockerfile | 0
.../Dockerfile.build-debian | 0
.../Dockerfile.build-debian-arm64 | 0
.../Dockerfile.build-debian-armhf | 0
.../Dockerfile.build-debian-minimal | 0
.../Dockerfile.build-debian-mips | 0
.../Dockerfile.build-fedora | 0
meson-cross-arm64.txt => ci/meson-cross-arm64.txt | 0
meson-cross-armhf.txt => ci/meson-cross-armhf.txt | 0
meson-cross-mips.txt => ci/meson-cross-mips.txt | 0
11 files changed, 6 insertions(+), 6 deletions(-)
rename Dockerfile => ci/Dockerfile (100%)
rename Dockerfile.build-debian => ci/Dockerfile.build-debian (100%)
rename Dockerfile.build-debian-arm64 => ci/Dockerfile.build-debian-arm64 (100%)
rename Dockerfile.build-debian-armhf => ci/Dockerfile.build-debian-armhf (100%)
rename Dockerfile.build-debian-minimal => ci/Dockerfile.build-debian-minimal (100%)
rename Dockerfile.build-debian-mips => ci/Dockerfile.build-debian-mips (100%)
rename Dockerfile.build-fedora => ci/Dockerfile.build-fedora (100%)
rename meson-cross-arm64.txt => ci/meson-cross-arm64.txt (100%)
rename meson-cross-armhf.txt => ci/meson-cross-armhf.txt (100%)
rename meson-cross-mips.txt => ci/meson-cross-mips.txt (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f252836c578..10fd28291cc8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,8 +27,8 @@ build-containers:build-debian:
image: registry.freedesktop.org/wayland/ci-templates/buildah:2019-08-13.0
script:
- podman login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - .gitlab-ci/pull-or-rebuild.sh base Dockerfile.build-debian-minimal build-debian-minimal
- - .gitlab-ci/pull-or-rebuild.sh base Dockerfile.build-debian build-debian
+ - .gitlab-ci/pull-or-rebuild.sh base ci/Dockerfile.build-debian-minimal build-debian-minimal
+ - .gitlab-ci/pull-or-rebuild.sh base ci/Dockerfile.build-debian build-debian
tags:
- packet.net
@@ -37,7 +37,7 @@ build-containers:build-debian-armhf:
image: registry.freedesktop.org/wayland/ci-templates/buildah:2019-08-13.0
script:
- podman login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - .gitlab-ci/pull-or-rebuild.sh base Dockerfile.build-debian-armhf build-debian-armhf
+ - .gitlab-ci/pull-or-rebuild.sh base ci/Dockerfile.build-debian-armhf build-debian-armhf
tags:
- packet.net
@@ -46,7 +46,7 @@ build-containers:build-debian-arm64:
image: registry.freedesktop.org/wayland/ci-templates/buildah:2019-08-13.0
script:
- podman login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - .gitlab-ci/pull-or-rebuild.sh base Dockerfile.build-debian-arm64 build-debian-arm64
+ - .gitlab-ci/pull-or-rebuild.sh base ci/Dockerfile.build-debian-arm64 build-debian-arm64
tags:
- packet.net
@@ -55,7 +55,7 @@ build-containers:build-debian-mips:
image: registry.freedesktop.org/wayland/ci-templates/buildah:2019-08-13.0
script:
- podman login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - .gitlab-ci/pull-or-rebuild.sh base Dockerfile.build-debian-mips build-debian-mips
+ - .gitlab-ci/pull-or-rebuild.sh base ci/Dockerfile.build-debian-mips build-debian-mips
tags:
- packet.net
@@ -64,7 +64,7 @@ build-containers:build-fedora:
image: registry.freedesktop.org/wayland/ci-templates/buildah:2019-08-13.0
script:
- podman login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - .gitlab-ci/pull-or-rebuild.sh base Dockerfile.build-fedora build-fedora
+ - .gitlab-ci/pull-or-rebuild.sh base ci/Dockerfile.build-fedora build-fedora
tags:
- packet.net
diff --git a/Dockerfile b/ci/Dockerfile
similarity index 100%
rename from Dockerfile
rename to ci/Dockerfile
diff --git a/Dockerfile.build-debian b/ci/Dockerfile.build-debian
similarity index 100%
rename from Dockerfile.build-debian
rename to ci/Dockerfile.build-debian
diff --git a/Dockerfile.build-debian-arm64 b/ci/Dockerfile.build-debian-arm64
similarity index 100%
rename from Dockerfile.build-debian-arm64
rename to ci/Dockerfile.build-debian-arm64
diff --git a/Dockerfile.build-debian-armhf b/ci/Dockerfile.build-debian-armhf
similarity index 100%
rename from Dockerfile.build-debian-armhf
rename to ci/Dockerfile.build-debian-armhf
diff --git a/Dockerfile.build-debian-minimal b/ci/Dockerfile.build-debian-minimal
similarity index 100%
rename from Dockerfile.build-debian-minimal
rename to ci/Dockerfile.build-debian-minimal
diff --git a/Dockerfile.build-debian-mips b/ci/Dockerfile.build-debian-mips
similarity index 100%
rename from Dockerfile.build-debian-mips
rename to ci/Dockerfile.build-debian-mips
diff --git a/Dockerfile.build-fedora b/ci/Dockerfile.build-fedora
similarity index 100%
rename from Dockerfile.build-fedora
rename to ci/Dockerfile.build-fedora
diff --git a/meson-cross-arm64.txt b/ci/meson-cross-arm64.txt
similarity index 100%
rename from meson-cross-arm64.txt
rename to ci/meson-cross-arm64.txt
diff --git a/meson-cross-armhf.txt b/ci/meson-cross-armhf.txt
similarity index 100%
rename from meson-cross-armhf.txt
rename to ci/meson-cross-armhf.txt
diff --git a/meson-cross-mips.txt b/ci/meson-cross-mips.txt
similarity index 100%
rename from meson-cross-mips.txt
rename to ci/meson-cross-mips.txt
--
2.31.1
More information about the igt-dev
mailing list