diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2021-01-21 11:09:04 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2021-01-21 11:11:47 +1000 |
| commit | 8fa3b314488ff6ab77aa773248ef36c18f749ade (patch) | |
| tree | c4529b4edab5442b5f5bc8e1ed2c3be703859338 /.gitlab-ci.yml | |
| parent | 8ae84b041b58a774be2b6c02fa85aa6745823393 (diff) | |
| download | xkeyboard-config-8fa3b314488ff6ab77aa773248ef36c18f749ade.tar.gz | |
Revert "gitlab CI: generate the evdev keycodes"
Some of the generated keys overwrote existing keys, causing warnings
and nonfunctional keys. For example:
xkbcommon: WARNING: Multiple names for keycode 121; Using <I121>, ignoring <MUTE>
Revert this commit, we're too close to a release and it's better to wait until
the next one to give this approach more time to settle.
Fixes #247
This reverts commit 5dc9b48c9b31de9f9780887a79ded3b1e52591d9.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c897d6..8ab316b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ variables: # Changing the tag will rebuild the container images. The value is just a # string, but we use the date for human benefits. - FDO_DISTRIBUTION_TAG: '2021-01-08.0' + FDO_DISTRIBUTION_TAG: '2020-11-06.0' stages: @@ -43,7 +43,7 @@ container-prep: # minimal set of packages required to build xkeyboard-config. BASE_PACKAGES: 'xorg-util-macros autoconf automake make gettext pkg-config gcc grep m4 python meson ninja git' # extra packages we need for various tests - EXTRA_PACKAGES: 'tree libxml2 bison xorg-xkbcomp python-pytest python-libevdev' + EXTRA_PACKAGES: 'tree libxml2 bison xorg-xkbcomp python-pytest' FDO_DISTRIBUTION_PACKAGES: $BASE_PACKAGES $EXTRA_PACKAGES @@ -162,22 +162,6 @@ meson_from_tarball: TARBALL: "xkeyboard-config-master.tar.bz2" GIT_STRATEGY: none -# Checks for new evdev keycodes to be added to keycodes/evdev -evdev keycode check: - extends: - - .default_setup - stage: test - script: - - .gitlab-ci/generate-evdev-keycodes.py --verbose --compare-with ./keycodes/evdev --template ./keycodes/evdev.in --output keycodes/evdev || (echo "keycodes/evdev file needs to be updated" && false) - allow_failure: true - artifacts: - when: on_failure - name: Updated evdev keycodes - expire_in: 2 weeks - paths: - - keycodes/evdev - needs: ['container-prep'] - xmllint: extends: - .default_setup |