From 275f28863d70e6ee6e3f2fe58e0a23f9cf0c0f34 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 3 Dec 2021 15:24:28 -0800 Subject: [PATCH 1/3] gitlab CI: add a basic build test Signed-off-by: Alan Coopersmith --- .gitlab-ci.yml | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..d7ea420 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,99 @@ +# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml: +# +# This CI uses the freedesktop.org ci-templates. +# Please see the ci-templates documentation for details: +# https://freedesktop.pages.freedesktop.org/ci-templates/ + +.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile + + +include: + # Debian container builder template + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/debian.yml' + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/ci-fairy.yml' + - template: Security/SAST.gitlab-ci.yml + + +stages: + - prep # prep work like rebuilding the container images if there is a change + - build # for actually building and testing things in a container + - test + - deploy + + +variables: + FDO_UPSTREAM_REPO: 'xorg/app/fstobdf' + FDO_DISTRIBUTION_VERSION: 'stable' + # The tag should be updated each time the list of packages is updated. + # Changing a tag forces the associated image to be rebuilt. + # Note: the tag has no meaning, we use a date format purely for readability + FDO_DISTRIBUTION_TAG: '2021-12-03.0' + FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xutils-dev x11proto-dev libx11-dev libfs-dev' + + +# +# Verify that commit messages are as expected, signed-off, etc. +# +check-commits: + extends: + - .fdo.ci-fairy + stage: prep + script: + - ci-fairy check-commits --signed-off-by --junit-xml=results.xml + except: + - master@xorg/app/fstobdf + variables: + GIT_DEPTH: 100 + artifacts: + reports: + junit: results.xml + +# +# Verify that the merge request has the allow-collaboration checkbox ticked +# +check-merge-request: + extends: + - .fdo.ci-fairy + stage: deploy + script: + - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml + artifacts: + when: on_failure + reports: + junit: results.xml + allow_failure: true + + +# +# Build a container with the given tag and the packages pre-installed. +# This only happens if when the tag changes, otherwise the existing image is +# re-used. +# +container-prep: + extends: + - .fdo.container-build@debian + stage: prep + variables: + GIT_STRATEGY: none + + +# +# The default build, runs on the image built above. +# +build: + stage: build + extends: + - .fdo.distribution-image@debian + script: + - autoreconf -ivf + - mkdir _builddir + - pushd _builddir > /dev/null + - ../configure --disable-silent-rules + - make + - make check + - make distcheck + - popd > /dev/null -- GitLab From d33be6f5c63df4287f1cd0353e2b820ecf62b94d Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 3 Dec 2021 15:24:34 -0800 Subject: [PATCH 2/3] Build xz tarballs instead of bzip2 Signed-off-by: Alan Coopersmith --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c5f34ba..a06a328 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) # Initialize Automake -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-xz]) # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], -- GitLab From e4188606121f82aa14516c7fcab6680df050002d Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 3 Dec 2021 15:26:11 -0800 Subject: [PATCH 3/3] Fix spelling/wording issues Found by using: codespell --builtin clear,rare,usage,informal,code,names Signed-off-by: Alan Coopersmith --- README.md | 2 +- fstobdf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 810e1c4..960f4cd 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Xorg mailing list: https://lists.x.org/mailman/listinfo/xorg -The master development code repository can be found at: +The primary development code repository can be found at: https://gitlab.freedesktop.org/xorg/app/fstobdf diff --git a/fstobdf.h b/fstobdf.h index 9b87b15..5645846 100644 --- a/fstobdf.h +++ b/fstobdf.h @@ -35,5 +35,5 @@ extern Bool EmitProperties ( FILE *outFile, FSXFontInfoHeader *fontHeader, extern Bool EmitCharacters ( FILE *outFile, FSServer *fontServer, FSXFontInfoHeader *fontHeader, Font fontID ); -extern unsigned long yResolution; /* intended vertical resoultion for font */ +extern unsigned long yResolution; /* intended vertical resolution for font */ extern unsigned long pointSize; /* font height in points */ -- GitLab