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

ci: Drop version suffix from job name

Browse Source 
We don't build images for multiple distro versions, so all it does
is making version bumps more finicky.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2695>
This commit is contained in:
Florian Müllner 2023-03-14 13:25:49 +01:00 committed by Marge Bot
parent f6a8b63276
commit 5a7ba105c4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci.yml
View File

@ -46,7 +46,7 @@ workflow:
- if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/' - if: '$CI_COMMIT_BRANCH =~ /^gnome-[0-9-]+$/'
- when: 'manual' - when: 'manual'
.gnome-shell.fedora:35: .gnome-shell.fedora:
variables: variables:
FDO_DISTRIBUTION_VERSION: 35 FDO_DISTRIBUTION_VERSION: 35
FDO_DISTRIBUTION_TAG: '2022-01-18.0' FDO_DISTRIBUTION_TAG: '2022-01-18.0'
@ -119,13 +119,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:35 - .gnome-shell.fedora
stage: prep stage: prep
js_check: js_check:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .gnome-shell.fedora:35 - .gnome-shell.fedora
stage: review stage: review
script: script:
- find js -name '*.js' $(printf "! -wholename %s " $(cat .jscheckignore)) -exec js91 -c '{}' ';' 2>&1 | tee $JS_LOG - find js -name '*.js' $(printf "! -wholename %s " $(cat .jscheckignore)) -exec js91 -c '{}' ';' 2>&1 | tee $JS_LOG
@ -138,7 +138,7 @@ js_check:
eslint: eslint:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .gnome-shell.fedora:35 - .gnome-shell.fedora
stage: review stage: review
script: script:
- export NODE_PATH=$(npm root -g) - export NODE_PATH=$(npm root -g)
@ -151,7 +151,7 @@ eslint:
eslint_mr: eslint_mr:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .gnome-shell.fedora:35 - .gnome-shell.fedora
stage: review stage: review
script: script:
- export NODE_PATH=$(npm root -g) - export NODE_PATH=$(npm root -g)
@ -168,7 +168,7 @@ eslint_mr:
potfile_c_check: potfile_c_check:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .gnome-shell.fedora:35 - .gnome-shell.fedora
stage: review stage: review
script: script:
- ./.gitlab-ci/check-potfiles.sh - ./.gitlab-ci/check-potfiles.sh
@ -176,7 +176,7 @@ potfile_c_check:
potfile_js_check: potfile_js_check:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .gnome-shell.fedora:35 - .gnome-shell.fedora
stage: review stage: review
script: script:
- js91 -m .gitlab-ci/check-potfiles.js - js91 -m .gitlab-ci/check-potfiles.js