ci: Update js image
- switch to F35 base - update eslint - update mozjs to 91 - install current gnome-extensions tool instead of ancient tag Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2115>
This commit is contained in:
parent
a0c8462170
commit
b001f18440
@ -1,7 +1,7 @@
|
|||||||
include:
|
include:
|
||||||
- remote: 'https://gitlab.gnome.org/GNOME/citemplates/raw/HEAD/flatpak/flatpak_ci_initiative.yml'
|
- remote: 'https://gitlab.gnome.org/GNOME/citemplates/raw/HEAD/flatpak/flatpak_ci_initiative.yml'
|
||||||
- remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml'
|
- remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/34f4ade99434043f88e164933f570301fd18b125/templates/fedora.yml'
|
||||||
- remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/ci-fairy.yml'
|
- remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/34f4ade99434043f88e164933f570301fd18b125/templates/ci-fairy.yml'
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- pre_review
|
- pre_review
|
||||||
@ -47,14 +47,20 @@ workflow:
|
|||||||
- if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/'
|
- if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/'
|
||||||
- when: 'manual'
|
- when: 'manual'
|
||||||
|
|
||||||
.gnome-shell.fedora:34:
|
.gnome-shell.fedora:35:
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_VERSION: 34
|
FDO_DISTRIBUTION_VERSION: 35
|
||||||
FDO_DISTRIBUTION_TAG: '2021-08-12.0'
|
FDO_DISTRIBUTION_TAG: '2022-01-18.0'
|
||||||
FDO_DISTRIBUTION_PACKAGES: >
|
FDO_DISTRIBUTION_PACKAGES:
|
||||||
findutils mozjs78-devel nodejs npm meson
|
findutils
|
||||||
pkgconfig(gio-2.0) pkgconfig(gio-unix-2.0)
|
mozjs91-devel
|
||||||
pkgconfig(gnome-autoar-0) pkgconfig(json-glib-1.0)
|
nodejs
|
||||||
|
npm
|
||||||
|
meson
|
||||||
|
pkgconfig(gio-2.0)
|
||||||
|
pkgconfig(gio-unix-2.0)
|
||||||
|
pkgconfig(gnome-autoar-0)
|
||||||
|
pkgconfig(json-glib-1.0)
|
||||||
FDO_DISTRIBUTION_EXEC: |
|
FDO_DISTRIBUTION_EXEC: |
|
||||||
# For static analysis with eslint
|
# For static analysis with eslint
|
||||||
npm install -g eslint eslint-plugin-jsdoc &&
|
npm install -g eslint eslint-plugin-jsdoc &&
|
||||||
@ -65,7 +71,7 @@ workflow:
|
|||||||
./.gitlab-ci/install-meson-project.sh \
|
./.gitlab-ci/install-meson-project.sh \
|
||||||
-Dman=false \
|
-Dman=false \
|
||||||
https://gitlab.gnome.org/GNOME/gnome-shell.git \
|
https://gitlab.gnome.org/GNOME/gnome-shell.git \
|
||||||
3.38.0 \
|
main \
|
||||||
subprojects/extensions-tool/ \
|
subprojects/extensions-tool/ \
|
||||||
./generate-translations.sh &&
|
./generate-translations.sh &&
|
||||||
|
|
||||||
@ -114,16 +120,16 @@ check-merge-request:
|
|||||||
build-fedora-container:
|
build-fedora-container:
|
||||||
extends:
|
extends:
|
||||||
- .fdo.container-build@fedora@x86_64
|
- .fdo.container-build@fedora@x86_64
|
||||||
- .gnome-shell.fedora:34
|
- .gnome-shell.fedora:35
|
||||||
stage: prep
|
stage: prep
|
||||||
|
|
||||||
js_check:
|
js_check:
|
||||||
extends:
|
extends:
|
||||||
- .fdo.distribution-image@fedora
|
- .fdo.distribution-image@fedora
|
||||||
- .gnome-shell.fedora:34
|
- .gnome-shell.fedora:35
|
||||||
stage: review
|
stage: review
|
||||||
script:
|
script:
|
||||||
- find js -name '*.js' $(printf "! -wholename %s " $(cat .jscheckignore)) -exec js78 -c '{}' ';' 2>&1 | tee $JS_LOG
|
- find js -name '*.js' $(printf "! -wholename %s " $(cat .jscheckignore)) -exec js91 -c '{}' ';' 2>&1 | tee $JS_LOG
|
||||||
- (! grep -q . $JS_LOG)
|
- (! grep -q . $JS_LOG)
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
@ -133,7 +139,7 @@ js_check:
|
|||||||
eslint:
|
eslint:
|
||||||
extends:
|
extends:
|
||||||
- .fdo.distribution-image@fedora
|
- .fdo.distribution-image@fedora
|
||||||
- .gnome-shell.fedora:34
|
- .gnome-shell.fedora:35
|
||||||
stage: review
|
stage: review
|
||||||
script:
|
script:
|
||||||
- export NODE_PATH=$(npm root -g)
|
- export NODE_PATH=$(npm root -g)
|
||||||
@ -146,7 +152,7 @@ eslint:
|
|||||||
eslint_mr:
|
eslint_mr:
|
||||||
extends:
|
extends:
|
||||||
- .fdo.distribution-image@fedora
|
- .fdo.distribution-image@fedora
|
||||||
- .gnome-shell.fedora:34
|
- .gnome-shell.fedora:35
|
||||||
stage: review
|
stage: review
|
||||||
script:
|
script:
|
||||||
- export NODE_PATH=$(npm root -g)
|
- export NODE_PATH=$(npm root -g)
|
||||||
@ -163,7 +169,7 @@ eslint_mr:
|
|||||||
potfile_c_check:
|
potfile_c_check:
|
||||||
extends:
|
extends:
|
||||||
- .fdo.distribution-image@fedora
|
- .fdo.distribution-image@fedora
|
||||||
- .gnome-shell.fedora:34
|
- .gnome-shell.fedora:35
|
||||||
stage: review
|
stage: review
|
||||||
script:
|
script:
|
||||||
- ./.gitlab-ci/check-potfiles.sh
|
- ./.gitlab-ci/check-potfiles.sh
|
||||||
@ -171,15 +177,15 @@ potfile_c_check:
|
|||||||
potfile_js_check:
|
potfile_js_check:
|
||||||
extends:
|
extends:
|
||||||
- .fdo.distribution-image@fedora
|
- .fdo.distribution-image@fedora
|
||||||
- .gnome-shell.fedora:34
|
- .gnome-shell.fedora:35
|
||||||
stage: review
|
stage: review
|
||||||
script:
|
script:
|
||||||
- js78 -m .gitlab-ci/check-potfiles.js
|
- js91 -m .gitlab-ci/check-potfiles.js
|
||||||
|
|
||||||
no_template_check:
|
no_template_check:
|
||||||
extends:
|
extends:
|
||||||
- .fdo.distribution-image@fedora
|
- .fdo.distribution-image@fedora
|
||||||
- .gnome-shell.fedora:34
|
- .gnome-shell.fedora:35
|
||||||
stage: review
|
stage: review
|
||||||
script:
|
script:
|
||||||
- ./.gitlab-ci/check-template-strings.sh
|
- ./.gitlab-ci/check-template-strings.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user