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

ci: Bump to F34

Browse Source 
This bumps both the mutter image to the F34 one, as well as the one used
for review.

This also bumps ci-templates hashes, so that we can use
FDO_DISTRIBUTION_PACKAGES without installing weak dependencies.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1906>
This commit is contained in:
Jonas Ådahl 2021-07-07 12:03:53 +02:00
parent 3cfbb48f46
commit 38d9b35ec8
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
.gitlab-ci.yml
View File

@ -1,7 +1,7 @@
include: include:
- remote: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml' - remote: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
- remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/7ea696055e322cc7aa4bcbe5422b56a198c4bdff/templates/fedora.yml' - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/3d03cccd770c04e63b40325b42223495274d6a1d/templates/fedora.yml'
- remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/f830873d69a7ff67a9bd69df2916dd0bb147ce09/templates/ci-fairy.yml" - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/3d03cccd770c04e63b40325b42223495274d6a1d/templates/ci-fairy.yml'
stages: stages:
- pre_review - pre_review
@ -29,7 +29,7 @@ variables:
LINT_LOG: "eslint-report.xml" LINT_LOG: "eslint-report.xml"
LINT_MR_LOG: "eslint-mr-report.xml" LINT_MR_LOG: "eslint-mr-report.xml"
image: registry.gitlab.gnome.org/gnome/mutter/fedora/33:x86_64-2021-02-04.2 image: registry.gitlab.gnome.org/gnome/mutter/fedora/34:x86_64-2021-07-07.1
workflow: workflow:
rules: rules:
@ -45,24 +45,21 @@ workflow:
- if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/' - if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/'
- when: 'manual' - when: 'manual'
.gnome-shell.fedora:33: .gnome-shell.fedora:34:
variables: variables:
FDO_DISTRIBUTION_VERSION: 33 FDO_DISTRIBUTION_VERSION: 34
FDO_DISTRIBUTION_TAG: '2020-11-17.0' FDO_DISTRIBUTION_TAG: '2021-07-07.1'
FDO_UPSTREAM_REPO: GNOME/gnome-shell FDO_UPSTREAM_REPO: GNOME/gnome-shell
FDO_DISTRIBUTION_PACKAGES: |
findutils mozjs78-devel 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 syntax checks using js78
dnf install -y findutils mozjs78-devel &&
# For static analysis with eslint # For static analysis with eslint
dnf install -y nodejs &&
npm install -g eslint && npm install -g eslint &&
dnf group install -y 'Development Tools' \ dnf group install -y 'Development Tools' \
'C Development Tools and Libraries' && 'C Development Tools and Libraries' &&
dnf install -y meson &&
dnf install -y 'pkgconfig(gio-2.0)' 'pkgconfig(gio-unix-2.0)' \
'pkgconfig(gnome-autoar-0)' 'pkgconfig(json-glib-1.0)' &&
./.gitlab-ci/install-meson-project.sh \ ./.gitlab-ci/install-meson-project.sh \
-Dman=false \ -Dman=false \
@ -116,13 +113,13 @@ 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:33 - .gnome-shell.fedora:34
stage: prep stage: prep
js_check: js_check:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .gnome-shell.fedora:33 - .gnome-shell.fedora:34
stage: review stage: review
script: script:
- find js -name '*.js' -exec js78 -c '{}' ';' 2>&1 | tee $JS_LOG - find js -name '*.js' -exec js78 -c '{}' ';' 2>&1 | tee $JS_LOG
@ -135,7 +132,7 @@ js_check:
eslint: eslint:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .gnome-shell.fedora:33 - .gnome-shell.fedora:34
stage: review stage: review
script: script:
- export NODE_PATH=$(npm root -g) - export NODE_PATH=$(npm root -g)
@ -148,7 +145,7 @@ eslint:
eslint_mr: eslint_mr:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .gnome-shell.fedora:33 - .gnome-shell.fedora:34
stage: review stage: review
script: script:
- export NODE_PATH=$(npm root -g) - export NODE_PATH=$(npm root -g)
@ -165,7 +162,7 @@ eslint_mr:
potfile_check: potfile_check:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .gnome-shell.fedora:33 - .gnome-shell.fedora:34
stage: review stage: review
script: script:
- ./.gitlab-ci/check-potfiles.sh - ./.gitlab-ci/check-potfiles.sh
@ -173,7 +170,7 @@ potfile_check:
no_template_check: no_template_check:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .gnome-shell.fedora:33 - .gnome-shell.fedora:34
stage: review stage: review
script: script:
- ./.gitlab-ci/check-template-strings.sh - ./.gitlab-ci/check-template-strings.sh