Skip to content

Commit

Permalink
Move .gitlab-ci to just ci
Browse files Browse the repository at this point in the history
To make it easier to tab-complete .gitlab-ci.yml vs ci/
  • Loading branch information
federicomenaquintero committed Feb 18, 2022
1 parent a904ea2 commit c475acd
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- indent-tabs-mode: nil -*-

include:
- local: '.gitlab-ci/container_builds.yml'
- local: 'ci/container_builds.yml'

variables:
LIBRSVG_DEBUG: "yes"
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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 }'
Expand Down Expand Up @@ -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"'
Expand Down
22 changes: 11 additions & 11 deletions .gitlab-ci/container_builds.yml → ci/container_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -30,31 +30,31 @@ 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:
extends: .container.opensuse@common
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:
extends: .container.opensuse@common
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:
extends: .container.opensuse@common
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
Expand Down Expand Up @@ -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"
Expand All @@ -102,15 +102,15 @@ 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:
extends: .container.fedora@common
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
Expand All @@ -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"
Expand All @@ -149,15 +149,15 @@ 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:
extends: .container.debian@common
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
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions .gitlab-ci/install-rust.sh → ci/install-rust.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source ./.gitlab-ci/env.sh
source ./ci/env.sh

set -eu
export CARGO_HOME='/usr/local/cargo'
Expand Down Expand Up @@ -33,4 +33,4 @@ if [ "$RUST_VERSION" = "nightly" ]; then

# Documentation tools
cargo install --force rustdoc-stripper
fi
fi
File renamed without changes.

0 comments on commit c475acd

Please sign in to comment.