[epiphany/mcatanzaro/freedesktop-ci-templates: 1/2] Use freedesktop-ci-templates
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/mcatanzaro/freedesktop-ci-templates: 1/2] Use freedesktop-ci-templates
- Date: Tue, 2 Aug 2022 17:52:51 +0000 (UTC)
commit a7b8c2efae69f4bbad8f55a0d31c781f86efd6ea
Author: Michael Catanzaro <mcatanzaro redhat com>
Date: Fri Jul 29 15:41:59 2022 -0500
Use freedesktop-ci-templates
This is trendy, and we don't have to maintain our own container images
anymore.
https://freedesktop.pages.freedesktop.org/ci-templates/templates.html
Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1180>
.gitlab-ci.yml | 50 ++++++++++++++++++++++++++++++++++++++++++++++--
.gitlab-ci/Dockerfile | 12 ------------
.gitlab-ci/README.md | 23 ----------------------
.gitlab-ci/run-podman.sh | 19 ------------------
4 files changed, 48 insertions(+), 56 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4089958a..ac55b7b6e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,6 @@
-include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+include:
+ - remote: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+ - remote:
'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/c5626190ec14b475271288dda7a7dae8dbe0cd76/templates/alpine.yml'
cache:
paths:
@@ -11,15 +13,59 @@ variables:
FLATPAK_MODULE: 'epiphany'
APP_ID: 'org.gnome.Epiphany.Devel'
ESLINT_LOG: "eslint-report.txt"
+ FDO_UPSTREAM_REPO: GNOME/epiphany
stages:
+ - prepare
- test
+# Use freedesktop-ci-templates for code style check and eslint.
+# Everything else uses flatpak-ci-initiative
+
+.alpine.container.common:
+ variables:
+ FDO_DISTRIBUTION_TAG: '2022-07-29.1'
+ FDO_DISTRIBUTION_VERSION: 'latest'
+
+build.container.alpine@x86_64:
+ extends:
+ - '.fdo.container-build@alpine'
+ - '.alpine.container.common'
+ stage: 'prepare'
+ variables:
+ GIT_STRATEGY: none
+ FDO_EXPIRES_AFTER: 8w
+ FDO_DISTRIBUTION_PACKAGES: >-
+ bash
+ nodejs
+ npm
+ python3
+ uncrustify
+ FDO_DISTRIBUTION_EXEC: >-
+ npm install -g eslint
+
check-code-style:
- image: registry.gitlab.gnome.org/gnome/epiphany/master:v4
+ extends:
+ - '.fdo.distribution-image@alpine'
+ - '.alpine.container.common'
+ stage: 'test'
interruptible: true
script:
- bash data/check-code-style
+ artifacts:
+ paths:
+ - ${ESLINT_LOG}
+ when: on_failure
+ except:
+ - gnome-*
+
+eslint:
+ extends:
+ - '.fdo.distribution-image@alpine'
+ - '.alpine.container.common'
+ stage: 'test'
+ interruptible: true
+ script:
- eslint -o eslint-report.txt --no-color embed/web-process-extension/resources/js/ || { cat $ESLINT_LOG;
false; }
artifacts:
paths:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]