brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Rebase extension-ci image to F32

Browse Source 
... and base our 'js' test on the js engine we are actually using.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1177
This commit is contained in:
Florian Müllner 2020-04-04 02:03:24 +02:00 committed by verdre
parent 859927df39
commit f89091d0f0
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -28,10 +28,10 @@ check_commit_log:
- merge_requests - merge_requests
js_check: js_check:
image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1 image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v2
stage: review stage: review
script: script:
- find js -name '*.js' -exec js60 -c -s '{}' ';' 2>&1 | tee $JS_LOG - find js -name '*.js' -exec js68 -c -s '{}' ';' 2>&1 | tee $JS_LOG
- (! grep -q . $JS_LOG) - (! grep -q . $JS_LOG)
<<: *only_default <<: *only_default
artifacts: artifacts:
@ -40,7 +40,7 @@ js_check:
when: on_failure when: on_failure
eslint: eslint:
image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1 image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v2
stage: review stage: review
script: script:
- ./.gitlab-ci/run-eslint.sh - ./.gitlab-ci/run-eslint.sh
@ -51,14 +51,14 @@ eslint:
when: always when: always
potfile_check: potfile_check:
image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1 image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v2
stage: review stage: review
script: script:
- ./.gitlab-ci/check-potfiles.sh - ./.gitlab-ci/check-potfiles.sh
<<: *only_default <<: *only_default
no_template_check: no_template_check:
image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1 image: registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v2
stage: review stage: review
script: script:
- ./.gitlab-ci/check-template-strings.sh - ./.gitlab-ci/check-template-strings.sh

13
.gitlab-ci/Dockerfile
View File

@ -1,17 +1,17 @@
# Rebuild and push with # Rebuild and push with
# #
# cd .gitlab-ci/ # cd .gitlab-ci/
# podman build --format docker --no-cache -t registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1 . # podman build --format docker --no-cache -t registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v2 .
# podman push registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1 # podman push registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v2
# #
FROM registry.fedoraproject.org/fedora:latest FROM registry.fedoraproject.org/fedora:32
RUN dnf -y update && dnf -y upgrade && \ RUN dnf -y update && dnf -y upgrade && \
dnf install -y 'dnf-command(copr)' git && \ dnf install -y 'dnf-command(copr)' git && \
# For syntax checks with `find . -name '*.js' -exec js60 -c -s '{}' ';'` # For syntax checks with `find . -name '*.js' -exec js68 -c -s '{}' ';'`
dnf install -y findutils mozjs60-devel && \ dnf install -y findutils mozjs68-devel && \
# For static analysis with eslint # For static analysis with eslint
dnf install -y nodejs && \ dnf install -y nodejs && \
@ -21,5 +21,4 @@ RUN dnf -y update && dnf -y upgrade && \
dnf copr enable -y fmuellner/gnome-shell-ci && \ dnf copr enable -y fmuellner/gnome-shell-ci && \
dnf install -y gnome-extensions-tool meson && \ dnf install -y gnome-extensions-tool meson && \
dnf clean all && \ dnf clean all
rm -rf /var/cache/dnf