Fix the CI for the new build system

Signed-off-by: Nico Sonack <[email protected]>
herrhotzenplotz · Jun 28, 2024 · de67a09 · de67a09
1 parent b5fffac
commit de67a09
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 23 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -6,45 +6,41 @@ alpine-amd64:
   stage: testing
   image: alpine:3.17
   script:
-    - apk add libcurl gcc autoconf automake libtool make pkgconf musl-dev curl-dev flex bison xz gzip bzip2 libbsd-dev kyua atf-dev libedit-dev
-    - ./autogen.sh
-    - ./configure CFLAGS='-std=c99 -pedantic -Wall -Wextra -Werror' CPPFLAGS='-D_XOPEN_SOURCE=600' --disable-silent-rules --with-libedit || (cat config.log && exit 42)
-    - make -j
-    - make -j distcheck
+    - apk add libcurl gcc make pkgconf musl-dev curl-dev flex bison libbsd-dev kyua atf-dev libedit-dev
+    - ./configure --debug
+    - make -j all
+    - make -j check
 
 freebsd-arm64:
   stage: testing
   tags:
     - freebsd
     - arm64
   script:
-    - ./autogen.sh
-    - ./configure LEX=flex YACC=byacc CFLAGS='-std=c99 -pedantic -Wall -Wextra -Wno-misleading-indentation -Werror' CPPFLAGS='-D_XOPEN_SOURCE=600' --disable-silent-rules || (cat config.log && exit 42)
-    - make -j 4
-    - make -j 4 distcheck
+    - ./configure --debug
+    - make -j 4 all
+    - make -j 4 check
 
 dist:
   stage: dist
   image: alpine:3.18
   script:
-    - apk add libcurl gcc autoconf automake libtool make pkgconf musl-dev curl-dev flex bison xz gzip bzip2 libbsd-dev kyua atf-dev cmark
-    - ./autogen.sh
-    - ./configure CFLAGS='-std=c99 -pedantic -Wall -Wextra -Werror' CPPFLAGS='-D_XOPEN_SOURCE=600' --disable-silent-rules || (cat config.log && exit 42)
-    - make -j dist
-    - cd docs/website && ./deploy.sh
+    - apk add libcurl gcc make pkgconf musl-dev curl-dev flex bison xz gzip bzip2 libbsd-dev kyua atf-dev cmark git
+    - ./configure --debug
+    - (cd docs/website && ./deploy.sh)
+    - tools/gentarball.sh
   artifacts:
     name: "Dist Tarballs"
     paths:
-      - gcli-*.tar.*
+      - dist/gcli-*/*
       - docs/website/website_dist.tar.xz
 
 debian-amd64:
   stage: testing
   image: debian:bullseye
   script:
     - apt-get update
-    - apt-get install -y --no-install-recommends build-essential libcurl4-openssl-dev pkgconf autotools-dev bison flex make autoconf automake libtool libbsd-dev libatf-dev kyua libreadline-dev libssl-dev
-    - ./autogen.sh
-    - ./configure CFLAGS='-std=c99 -pedantic -Wall -Wextra -Werror -Wno-misleading-indentation' CPPFLAGS='-D_XOPEN_SOURCE=600' --disable-silent-rules --with-readline || (cat config.log && exit 42)
-    - make -j
-    - make -j distcheck
+    - apt-get install -y --no-install-recommends build-essential libcurl4-openssl-dev pkgconf bison flex make libbsd-dev libatf-dev kyua libreadline-dev libssl-dev
+    - ./configure --debug
+    - make -j all
+    - make -j check
diff --git a/tools/gentarball.sh b/tools/gentarball.sh
@@ -1,13 +1,16 @@
 #!/bin/sh
+#
+
+command -v git > /dev/null 2>&1 || (echo "error: you need git to run this script" && exit 1)
 
 findversion() {
-	eval $(grep version $(dirname $0)/../configure | sed 1q)
-	echo $version
+	eval $(grep PACKAGE_VERSION $(dirname $0)/../configure | sed 1q)
+	echo $PACKAGE_VERSION
 }
 
 VERSION=$(findversion)
 
-DIR=/tmp/gcli-${VERSION}
+DIR=$(git rev-parse --show-toplevel)/dist/gcli-${VERSION}
 mkdir -p $DIR
 
 echo "Making BZIP tarball"