[gnome-shell] ci: Rebase extension-ci image to F32
- From: verdre <jonasd src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] ci: Rebase extension-ci image to F32
- Date: Tue, 28 Apr 2020 09:12:01 +0000 (UTC)
commit f89091d0f09a0acfa648f1d1cfb68a046dee3edf
Author: Florian Müllner <fmuellner gnome org>
Date: Sat Apr 4 02:03:24 2020 +0200
ci: Rebase extension-ci image to F32
... and base our 'js' test on the js engine we are actually using.
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1177
.gitlab-ci.yml | 10 +++++-----
.gitlab-ci/Dockerfile | 13 ++++++-------
2 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e25e96f10..0a158117b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,10 +28,10 @@ check_commit_log:
- merge_requests
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
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)
<<: *only_default
artifacts:
@@ -40,7 +40,7 @@ js_check:
when: on_failure
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
script:
- ./.gitlab-ci/run-eslint.sh
@@ -51,14 +51,14 @@ eslint:
when: always
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
script:
- ./.gitlab-ci/check-potfiles.sh
<<: *only_default
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
script:
- ./.gitlab-ci/check-template-strings.sh
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 4c7f1097d2..fd0eb2a935 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,17 +1,17 @@
# Rebuild and push with
#
# cd .gitlab-ci/
-# podman build --format docker --no-cache -t registry.gitlab.gnome.org/gnome/gnome-shell/extension-ci:v1
.
-# podman push 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:v2
#
-FROM registry.fedoraproject.org/fedora:latest
+FROM registry.fedoraproject.org/fedora:32
RUN dnf -y update && dnf -y upgrade && \
dnf install -y 'dnf-command(copr)' git && \
- # For syntax checks with `find . -name '*.js' -exec js60 -c -s '{}' ';'`
- dnf install -y findutils mozjs60-devel && \
+ # For syntax checks with `find . -name '*.js' -exec js68 -c -s '{}' ';'`
+ dnf install -y findutils mozjs68-devel && \
# For static analysis with eslint
dnf install -y nodejs && \
@@ -21,5 +21,4 @@ RUN dnf -y update && dnf -y upgrade && \
dnf copr enable -y fmuellner/gnome-shell-ci && \
dnf install -y gnome-extensions-tool meson && \
- dnf clean all && \
- rm -rf /var/cache/dnf
+ dnf clean all
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]