From 929f8be48df8ddfb56630b55cc7deb110d1fe4c6 Mon Sep 17 00:00:00 2001
From: Simon Sobisch <simonsobisch@web.de>
Date: Mon, 25 Nov 2024 19:05:52 +0100
Subject: [PATCH] Update .gitpod.yml

---
 .gitpod.yml | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index 6cdf438c1..7a99534e2 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -3,49 +3,52 @@ image: gitpod/workspace-c
 
 tasks:
 
-- name: setup coding environment on Ubuntu 20.04
+- name: setup coding environment on Ubuntu 22.04
   before: |
     # note: sadly we need this to be done every time as only /workspace is kept, but linked
     #       against those dependencies; and also we do want to recompile after adjustments
     #       this can all be dropped as soon as we would use a prepared docker
     sudo apt update && sudo apt upgrade -y
     sudo apt install -y build-essential libgmp-dev libdb-dev libjson-c-dev ncurses-dev libxml2-dev \
-         automake libtool flex bison help2man texinfo \
-         lcov
-    # sudo apt install gettext texlive-base  # for make dist (po/*, doc/gnucobol.pdf)
+         automake libtool flex bison help2man gettext texinfo \
+         lcov \
+         clangd bear
+    # sudo apt install texlive-base  # for make dist (doc/gnucobol.pdf)
     gp sync-done system-prepare
 
 - name: building GnuCOBOL
   init: |
-    mkdir -p $GITPOD_REPO_ROOTS/_build
-    cd $GITPOD_REPO_ROOTS/_build
+    mkdir -p $GITPOD_REPO_ROOTS/build
+    cd $GITPOD_REPO_ROOTS/build
     gp sync-await system-prepare
     ../autogen.sh
-    ../configure --enable-cobc-internal-checks --enable-debug --enable-code-coverage
-    make --jobs=$(nproc)
+    ../configure --enable-cobc-internal-checks --enable-debug --enable-code-coverage \
+         CC="gcc -std=c89" CPPFLAGS="-Werror=declaration-after-statement"
+    bear -- make --jobs=$(nproc)
   command: |
-    cd $GITPOD_REPO_ROOTS/_build
+    cd $GITPOD_REPO_ROOTS/build
     gp sync-done build-finish
 
 - name: running GnuCOBOL tests with coverage
   command: |
     gp sync-await build-finish
-    cd $GITPOD_REPO_ROOTS/_build
+    cd $GITPOD_REPO_ROOTS/build
     half_jobs=$(( $(nproc) / 2 ))
     nice make --jobs=${half_jobs} check-code-coverage TESTSUITEFLAGS="--jobs=${half_jobs}"
 
 - name: running NIST85 tests
   command: |
     gp sync-await build-finish
-    cd $GITPOD_REPO_ROOTS/_build
+    cd $GITPOD_REPO_ROOTS/build
     half_jobs=$(( $(nproc) / 2 ))
     nice make -C tests/cobol85 --jobs=${half_jobs} test
 
-# disabled as the download takes too long
+# disabled as running that is really only useful *after*
+# several adjustments to the build system -> manually
 #- name: running GnuCOBOL distribution tests with testuite
 #  command: |
 #    gp sync-await build-finish
-#    cd $GITPOD_REPO_ROOTS/_build
+#    cd $GITPOD_REPO_ROOTS/build
 #    half_jobs=$(( $(nproc) / 2 ))
 #    nice make --jobs=${half_jobs} distcheck TESTSUITEFLAGS="--jobs=${half_jobs}"
 
@@ -58,3 +61,4 @@ vscode:
     - tenninebt.vscode-koverage
     - meronz.manpages
     - webfreak.debug
+    - OCamlPro.SuperBOL