[at-spi2-core: 1/7] Rename .gitlab-ci/ to ci/ - for easier Tab completion
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-core: 1/7] Rename .gitlab-ci/ to ci/ - for easier Tab completion
- Date: Wed, 20 Apr 2022 01:05:32 +0000 (UTC)
commit 2fa2da8cc9b4a367e15ed999bea3e11fcacf8317
Author: Federico Mena Quintero <federico gnome org>
Date: Fri Mar 18 11:23:35 2022 -0600
Rename .gitlab-ci/ to ci/ - for easier Tab completion
Make the source tree a bit less magic by having fewer dotfiles.
.gitlab-ci.yml | 14 +++++++-------
{.gitlab-ci => ci}/README.md | 0
{.gitlab-ci => ci}/gen-coverage.sh | 6 +++---
{.gitlab-ci => ci}/lcovrc | 0
{.gitlab-ci => ci}/opensuse.Dockerfile | 0
{.gitlab-ci => ci}/run-docker.sh | 0
{.gitlab-ci => ci}/run-style-check.sh | 2 +-
{.gitlab-ci => ci}/run-tests.sh | 0
{.gitlab-ci => ci}/search-common-ancestor.sh | 0
9 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 963a79e9..a3e4543b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ stages:
# stage: style-check
# script:
# - dnf install -y clang-tools-extra curl diffutils git
-# - sh -x ./.gitlab-ci/run-style-check.sh
+# - sh -x ./ci/run-style-check.sh
# Template for the default build recipe.
@@ -54,7 +54,7 @@ stages:
- meson install -C _build
- mkdir /tmp/test+dir+with+funny+chars
- export XDG_RUNTIME_DIR=/tmp/test+dir+with+funny+chars # See
https://gitlab.gnome.org/GNOME/at-spi2-core/-/issues/48
- - dbus-run-session -- .gitlab-ci/run-tests.sh
+ - dbus-run-session -- ci/run-tests.sh
artifacts:
reports:
junit: "_build/meson-logs/testlog.junit.xml"
@@ -130,7 +130,7 @@ asan-build:
- CC=clang meson setup ${MESON_EXTRA_FLAGS} --prefix /usr _build .
- meson compile -C _build
- meson install -C _build
- - dbus-run-session -- .gitlab-ci/run-tests.sh
+ - dbus-run-session -- ci/run-tests.sh
artifacts:
name: "at-spi2-core-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
when: always
@@ -153,10 +153,10 @@ coverage:
- meson compile -C _build
- meson install -C _build
- mkdir -p _coverage
- - lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --initial --output-file
"_coverage/${CI_JOB_NAME}-baseline.lcov"
- - dbus-run-session -- .gitlab-ci/run-tests.sh
- - lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --output-file
"_coverage/${CI_JOB_NAME}.lcov"
- - bash -x .gitlab-ci/gen-coverage.sh
+ - lcov --config-file ci/lcovrc --directory _build --capture --initial --output-file
"_coverage/${CI_JOB_NAME}-baseline.lcov"
+ - dbus-run-session -- ci/run-tests.sh
+ - lcov --config-file ci/lcovrc --directory _build --capture --output-file "_coverage/${CI_JOB_NAME}.lcov"
+ - bash -x ci/gen-coverage.sh
- mkdir -p public/
- cp -r _coverage public/coverage
coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/'
diff --git a/.gitlab-ci/README.md b/ci/README.md
similarity index 100%
rename from .gitlab-ci/README.md
rename to ci/README.md
diff --git a/.gitlab-ci/gen-coverage.sh b/ci/gen-coverage.sh
similarity index 63%
rename from .gitlab-ci/gen-coverage.sh
rename to ci/gen-coverage.sh
index 39492565..e2f057bf 100644
--- a/.gitlab-ci/gen-coverage.sh
+++ b/ci/gen-coverage.sh
@@ -3,13 +3,13 @@
set -e
for path in _coverage/*.lcov; do
- lcov --config-file .gitlab-ci/lcovrc -r "${path}" '*/_build/*' -o "$(pwd)/${path}"
- lcov --config-file .gitlab-ci/lcovrc -e "${path}" "$(pwd)/*" -o "$(pwd)/${path}"
+ lcov --config-file ci/lcovrc -r "${path}" '*/_build/*' -o "$(pwd)/${path}"
+ lcov --config-file ci/lcovrc -e "${path}" "$(pwd)/*" -o "$(pwd)/${path}"
done
genhtml \
--ignore-errors=source \
- --config-file .gitlab-ci/lcovrc \
+ --config-file ci/lcovrc \
_coverage/*.lcov \
-o _coverage/coverage
diff --git a/.gitlab-ci/lcovrc b/ci/lcovrc
similarity index 100%
rename from .gitlab-ci/lcovrc
rename to ci/lcovrc
diff --git a/.gitlab-ci/opensuse.Dockerfile b/ci/opensuse.Dockerfile
similarity index 100%
rename from .gitlab-ci/opensuse.Dockerfile
rename to ci/opensuse.Dockerfile
diff --git a/.gitlab-ci/run-docker.sh b/ci/run-docker.sh
similarity index 100%
rename from .gitlab-ci/run-docker.sh
rename to ci/run-docker.sh
diff --git a/.gitlab-ci/run-style-check.sh b/ci/run-style-check.sh
similarity index 94%
rename from .gitlab-ci/run-style-check.sh
rename to ci/run-style-check.sh
index 9d741bcc..5f7c6f9c 100755
--- a/.gitlab-ci/run-style-check.sh
+++ b/ci/run-style-check.sh
@@ -7,7 +7,7 @@ ancestor_horizon=28 # days (4 weeks)
# Wrap everything in a subshell so we can propagate the exit status.
(
-source .gitlab-ci/search-common-ancestor.sh
+source ci/search-common-ancestor.sh
git diff -U0 --no-color "${newest_common_ancestor_sha}" atspi/*.c bus/*.c dbind/*.c registryd/*.c test/*.c |
clang-format-diff -p1 > format-diff.log
diff --git a/.gitlab-ci/run-tests.sh b/ci/run-tests.sh
similarity index 100%
rename from .gitlab-ci/run-tests.sh
rename to ci/run-tests.sh
diff --git a/.gitlab-ci/search-common-ancestor.sh b/ci/search-common-ancestor.sh
similarity index 100%
rename from .gitlab-ci/search-common-ancestor.sh
rename to ci/search-common-ancestor.sh
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]