[librsvg: 3/5] Move .gitlab-ci to just ci
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 3/5] Move .gitlab-ci to just ci
- Date: Fri, 18 Feb 2022 01:20:57 +0000 (UTC)
commit c475acd1d4e40684d03f2b1051ba906ccf8943bf
Author: Federico Mena Quintero <federico gnome org>
Date: Thu Feb 17 18:00:55 2022 -0600
Move .gitlab-ci to just ci
To make it easier to tab-complete .gitlab-ci.yml vs ci/
.gitlab-ci.yml | 8 ++++----
{.gitlab-ci => ci}/container_builds.yml | 22 +++++++++++-----------
{.gitlab-ci => ci}/env.sh | 0
{.gitlab-ci => ci}/install-rust.sh | 4 ++--
{.gitlab-ci => ci}/test-msys2.sh | 0
5 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0b7dd732..a3d8bff54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
# -*- indent-tabs-mode: nil -*-
include:
- - local: '.gitlab-ci/container_builds.yml'
+ - local: 'ci/container_builds.yml'
variables:
LIBRSVG_DEBUG: "yes"
@@ -193,7 +193,7 @@ build-rsvg-opensuse@x86_64.nightly:
# Override the CARGO_HOME variable to force its location
CARGO_HOME: "${CI_PROJECT_DIR}/cargo_cache"
before_script:
- - source ./.gitlab-ci/env.sh
+ - source ./ci/env.sh
- mkdir -p cargo_cache
cache:
key:
@@ -263,7 +263,7 @@ coverage:
script:
- cargo +nightly test --no-fail-fast || true
after_script:
- - source ./.gitlab-ci/env.sh
+ - source ./ci/env.sh
- grcov coverage-profiles --binary-path ./target/debug/ --source-dir . --output-type cobertura --llvm
--branch --ignore-not-existing --ignore "*cargo*" -o coverage.xml
- grcov coverage-profiles --binary-path ./target/debug/ --source-dir . --output-type html --llvm
--branch --ignore-not-existing --ignore "build.rs" --output-path public/coverage
- grep -Eo 'line-rate="[^"]+"' coverage.xml | head -n 1 | grep -Eo '[0-9.]+' | awk '{ print "Coverage:",
$1 * 100 }'
@@ -317,7 +317,7 @@ msys2-mingw64:
CHERE_INVOKING: "yes"
script:
- C:\msys64\usr\bin\pacman --noconfirm -Syyuu
- - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
+ - C:\msys64\usr\bin\bash -lc "bash -x ./ci/test-msys2.sh"
rules:
- if: '$CI_PIPELINE_SOURCE == "push"'
- if: '$CI_PIPELINE_SOURCE == "schedule"'
diff --git a/.gitlab-ci/container_builds.yml b/ci/container_builds.yml
similarity index 87%
rename from .gitlab-ci/container_builds.yml
rename to ci/container_builds.yml
index 8e485635a..8e4d5cba2 100644
--- a/.gitlab-ci/container_builds.yml
+++ b/ci/container_builds.yml
@@ -13,7 +13,7 @@ variables:
.container.opensuse@common:
stage: "container-build"
before_script:
- - source ./.gitlab-ci/env.sh
+ - source ./ci/env.sh
variables:
FDO_DISTRIBUTION_VERSION: "tumbleweed"
FDO_UPSTREAM_REPO: "gnome/librsvg"
@@ -30,7 +30,7 @@ variables:
variables:
FDO_DISTRIBUTION_TAG: "x86_64-${RUST_STABLE}-${BASE_TAG}"
FDO_DISTRIBUTION_EXEC: >-
- bash .gitlab-ci/install-rust.sh ${RUST_STABLE} x86_64-unknown-linux-gnu &&
+ bash ci/install-rust.sh ${RUST_STABLE} x86_64-unknown-linux-gnu &&
pip3 install gi-docgen
.container.opensuse@x86_64.minimum:
@@ -38,7 +38,7 @@ variables:
variables:
FDO_DISTRIBUTION_TAG: "x86_64-${RUST_MINIMUM}-${BASE_TAG}"
FDO_DISTRIBUTION_EXEC: >-
- bash .gitlab-ci/install-rust.sh ${RUST_MINIMUM} x86_64-unknown-linux-gnu &&
+ bash ci/install-rust.sh ${RUST_MINIMUM} x86_64-unknown-linux-gnu &&
pip3 install gi-docgen
.container.opensuse@x86_64.nightly:
@@ -46,7 +46,7 @@ variables:
variables:
FDO_DISTRIBUTION_TAG: "x86_64-nightly-${BASE_TAG}"
FDO_DISTRIBUTION_EXEC: >-
- bash .gitlab-ci/install-rust.sh nightly x86_64-unknown-linux-gnu &&
+ bash ci/install-rust.sh nightly x86_64-unknown-linux-gnu &&
pip3 install gi-docgen
.container.opensuse@aarch64:
@@ -54,7 +54,7 @@ variables:
variables:
FDO_DISTRIBUTION_TAG: "aarch64-${RUST_STABLE}-${BASE_TAG}"
FDO_DISTRIBUTION_EXEC: >-
- bash .gitlab-ci/install-rust.sh ${RUST_STABLE} aarch64-unknown-linux-gnu &&
+ bash ci/install-rust.sh ${RUST_STABLE} aarch64-unknown-linux-gnu &&
pip3 install gi-docgen
tags:
- aarch64
@@ -85,7 +85,7 @@ opensuse-container@x86_64.nightly:
.container.fedora@common:
before_script:
- - source ./.gitlab-ci/env.sh
+ - source ./ci/env.sh
variables:
FDO_DISTRIBUTION_VERSION: "34"
FDO_UPSTREAM_REPO: "gnome/librsvg"
@@ -102,7 +102,7 @@ opensuse-container@x86_64.nightly:
variables:
FDO_DISTRIBUTION_TAG: "x86_64-${RUST_STABLE}-${BASE_TAG}"
FDO_DISTRIBUTION_EXEC: >-
- bash .gitlab-ci/install-rust.sh ${RUST_STABLE} x86_64-unknown-linux-gnu &&
+ bash ci/install-rust.sh ${RUST_STABLE} x86_64-unknown-linux-gnu &&
pip3 install gi-docgen
.container.fedora@aarch64:
@@ -110,7 +110,7 @@ opensuse-container@x86_64.nightly:
variables:
FDO_DISTRIBUTION_TAG: "aarch64-${RUST_STABLE}-${BASE_TAG}"
FDO_DISTRIBUTION_EXEC: >-
- bash .gitlab-ci/install-rust.sh ${RUST_STABLE} aarch64-unknown-linux-gnu &&
+ bash ci/install-rust.sh ${RUST_STABLE} aarch64-unknown-linux-gnu &&
pip3 install gi-docgen
tags:
- aarch64
@@ -131,7 +131,7 @@ opensuse-container@x86_64.nightly:
extends:
- .fdo.container-build@debian@x86_64
before_script:
- - source ./.gitlab-ci/env.sh
+ - source ./ci/env.sh
variables:
FDO_DISTRIBUTION_VERSION: "testing"
FDO_UPSTREAM_REPO: "gnome/librsvg"
@@ -149,7 +149,7 @@ opensuse-container@x86_64.nightly:
variables:
FDO_DISTRIBUTION_TAG: "x86_64-${RUST_STABLE}-${BASE_TAG}"
FDO_DISTRIBUTION_EXEC: >-
- bash .gitlab-ci/install-rust.sh ${RUST_STABLE} x86_64-unknown-linux-gnu &&
+ bash ci/install-rust.sh ${RUST_STABLE} x86_64-unknown-linux-gnu &&
pip3 install gi-docgen
.container.debian@aarch64:
@@ -157,7 +157,7 @@ opensuse-container@x86_64.nightly:
variables:
FDO_DISTRIBUTION_TAG: "aarch64-${RUST_STABLE}-${BASE_TAG}"
FDO_DISTRIBUTION_EXEC: >-
- bash .gitlab-ci/install-rust.sh ${RUST_STABLE} aarch64-unknown-linux-gnu &&
+ bash ci/install-rust.sh ${RUST_STABLE} aarch64-unknown-linux-gnu &&
pip3 install gi-docgen
tags:
- aarch64
diff --git a/.gitlab-ci/env.sh b/ci/env.sh
similarity index 100%
rename from .gitlab-ci/env.sh
rename to ci/env.sh
diff --git a/.gitlab-ci/install-rust.sh b/ci/install-rust.sh
similarity index 96%
rename from .gitlab-ci/install-rust.sh
rename to ci/install-rust.sh
index 9bd9e1750..46e1d96d5 100755
--- a/.gitlab-ci/install-rust.sh
+++ b/ci/install-rust.sh
@@ -1,4 +1,4 @@
-source ./.gitlab-ci/env.sh
+source ./ci/env.sh
set -eu
export CARGO_HOME='/usr/local/cargo'
@@ -33,4 +33,4 @@ if [ "$RUST_VERSION" = "nightly" ]; then
# Documentation tools
cargo install --force rustdoc-stripper
-fi
\ No newline at end of file
+fi
diff --git a/.gitlab-ci/test-msys2.sh b/ci/test-msys2.sh
similarity index 100%
rename from .gitlab-ci/test-msys2.sh
rename to ci/test-msys2.sh
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]