[gjs: 4/15] CI: Remove tokei build
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 4/15] CI: Remove tokei build
- Date: Fri, 20 Sep 2019 00:56:43 +0000 (UTC)
commit bec22414c99010141c12102484a11145abf51b01
Author: Philip Chimento <philip chimento gmail com>
Date: Sat Sep 7 17:50:00 2019 -0700
CI: Remove tokei build
This was another one that was rarely used, and GitLab basically provides
similar statistics on the front page of each repo.
.gitlab-ci.yml | 19 +++----------------
README.md | 1 -
test/extra/Dockerfile.fedora.static-analysis | 3 +--
test/test-ci.sh | 5 -----
4 files changed, 4 insertions(+), 24 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81d1d8a6..45f23e9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,8 +22,8 @@ stages:
'
.JHBuild files: &JHB_files [.cache/jhbuild/build/gjs/*.log, .cache/jhbuild/build/gjs/Makefile,
.cache/jhbuild/build/gjs/configure]
-.Coverage files: &cov_files [configure, Makefile, analysis/, ./*.log, ./*.trs,
./installed-tests/scripts/*.log, ./installed-tests/scripts/*.trs, coverage/]
-.Regular files: ®_files [configure, Makefile, analysis/, ./*.log, ./*.trs,
./installed-tests/scripts/*.log, ./installed-tests/scripts/*.trs]
+.Coverage files: &cov_files [configure, Makefile, ./*.log, ./*.trs, ./installed-tests/scripts/*.log,
./installed-tests/scripts/*.trs, coverage/]
+.Regular files: ®_files [configure, Makefile, ./*.log, ./*.trs, ./installed-tests/scripts/*.log,
./installed-tests/scripts/*.trs]
.jhbuild: &jhbuild
artifacts:
@@ -169,15 +169,13 @@ coverage-automatic:
- master@GNOME/gjs
# Publishes
-# The reports (coverage and code statistics)
+# The code coverage report
pages:
stage: deploy
dependencies:
- coverage-automatic
- - code_statistics
script:
- mv $(pwd)/coverage/ public/ || true
- - mv $(pwd)/analysis/report.txt public/ || true
artifacts:
paths:
- public
@@ -246,17 +244,6 @@ codequality:
except:
- schedules
-code_statistics:
- <<: *build
- stage: manual
- image: registry.gitlab.gnome.org/gnome/gjs:fedora.static-analysis
- variables:
- TASK_ID: "code_statistics"
- CODECHECK: "TOKEI"
- when: manual
- except:
- - schedules
-
coverage:
<<: *build
<<: *coverage
diff --git a/README.md b/README.md
index e21ef389..6ed1dcdf 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
[](https://gitlab.gnome.org/GNOME/gjs/pipelines)
[](https://gnome.pages.gitlab.gnome.org/gjs/)
[](https://gitlab.gnome.org/GNOME/gjs/graphs/master)
-[](https://gnome.pages.gitlab.gnome.org/gjs/report.txt)
[](https://gitlab.gnome.org/GNOME/gjs/commits/master)
[](https://github.com/search?utf8=%E2%9C%93&q=gjs&type=)
[](https://gitlab.gnome.org/GNOME/gjs/blob/master/COPYING)
diff --git a/test/extra/Dockerfile.fedora.static-analysis b/test/extra/Dockerfile.fedora.static-analysis
index 70f62115..92bde459 100644
--- a/test/extra/Dockerfile.fedora.static-analysis
+++ b/test/extra/Dockerfile.fedora.static-analysis
@@ -6,8 +6,7 @@ LABEL version="1.0"
LABEL description="Docker image to run CI for GNOME GJS (JavaScript bindings for GNOME)."
RUN dnf -y --nogpgcheck upgrade && \
- dnf -y install \
- git cppcheck tokei nodejs python-devel && \
+ dnf -y install git cppcheck nodejs python-devel && \
mkdir -p /cwd && \
pip install cpplint && \
npm install -g eslint && \
diff --git a/test/test-ci.sh b/test/test-ci.sh
index ad4b971e..fceef926 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -292,11 +292,6 @@ elif [[ $1 == "ESLINT" && "$log_message" != *'[skip eslint]'* ]]; then
# Compare the report with master and fail if new warnings are found
do_Compare_With_Upstream_Master "esLint"
-
-elif [[ $1 == "TOKEI" ]]; then
- do_Print_Labels 'Project statistics'
-
- tokei . | tee "$save_dir"/analysis/report.txt
fi
# Releases stuff and finishes
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]