[igt-dev] [PATCH v3 03/12] ci: Move files to ci/ subdir
Petri Latvala
petri.latvala at intel.com
Mon Apr 4 10:44:11 UTC 2022
On Fri, Mar 11, 2022 at 03:12:51PM +0100, Tomeu Vizoso wrote:
> We will be adding a few more files soon.
>
> Signed-off-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
> ---
> .gitlab-ci.yml | 20 +++++++++----------
> 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 | 0
> .../meson-cross-armhf.txt | 0
> .../meson-cross-mips.txt | 0
> 11 files changed, 10 insertions(+), 10 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%)
meson-cross-* files are used for cross-compiling in general, not just
for ci'ing. They can be left in the toplevel dir.
--
Petri Latvala
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 9f252836c578..9c91ce067d75 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
>
> @@ -143,7 +143,7 @@ build:tests-debian-meson-armhf:
> stage: build
> script:
> - export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/
> - - meson --cross-file meson-cross-armhf.txt build
> + - meson --cross-file ci/meson-cross-armhf.txt build
> - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1
> artifacts:
> paths:
> @@ -154,7 +154,7 @@ build:tests-debian-meson-arm64:
> stage: build
> script:
> - export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig/
> - - meson --cross-file meson-cross-arm64.txt build
> + - meson --cross-file ci/meson-cross-arm64.txt build
> - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1
> artifacts:
> paths:
> @@ -165,7 +165,7 @@ build:tests-debian-meson-mips:
> stage: build
> script:
> - export PKG_CONFIG_PATH=/usr/lib/mips-linux-gnu/pkgconfig/
> - - meson --cross-file meson-cross-mips.txt build
> + - meson --cross-file ci/meson-cross-mips.txt build
> - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1
> artifacts:
> paths:
> @@ -296,4 +296,4 @@ containers:igt:
> FORCE_REBUILD: 1
> script:
> - podman login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
> - - .gitlab-ci/pull-or-rebuild.sh igt Dockerfile igt
> + - .gitlab-ci/pull-or-rebuild.sh igt ci/Dockerfile igt
> 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