Merge branch 'ci_improvemens' into ci_docker_prototyping

Author: hdiethelm

.github/scripts/add-linuxcnc-repository.sh

@@ -12,8 +12,8 @@ case $DIST in
                 ;;
         *)
                 GPGTMP=$(mktemp -d /tmp/.gnupgXXXXXX)
-                gpg --homedir $GPGTMP --keyserver hkp://keyserver.ubuntu.com --recv-key e43b5a8e78cc2927
-                gpg --homedir $GPGTMP --export 'LinuxCNC Archive Signing Key' | sudo tee /etc/apt/keyrings/linuxcnc.gpg > /dev/null
+                gpg --homedir "$GPGTMP" --keyserver hkp://keyserver.ubuntu.com --recv-key e43b5a8e78cc2927
+                gpg --homedir "$GPGTMP" --export 'LinuxCNC Archive Signing Key' | sudo tee /etc/apt/keyrings/linuxcnc.gpg > /dev/null
                 ;;
 esac
 sudo apt-get --quiet update

.github/scripts/build-rip.sh

@@ -7,5 +7,5 @@ set -x
 
 cd src
 ./autogen.sh
-./configure $@ --disable-check-runtime-deps --enable-werror
+./configure "$@" --disable-check-runtime-deps --enable-werror
 make -O -j$((1+$(nproc))) default pycheck V=1

.github/scripts/install-rtai.sh

@@ -5,21 +5,22 @@ set -x
 
 DIST=$1
 
-#To install the RTAI deb's from linuxcnc base
-#.github/scripts/add-linuxcnc-repository.sh $DIST
-#sudo apt-get --yes install linux-headers-5.4.279-rtai-amd64 linux-image-5.4.279-rtai-amd64 rtai-modules-5.4.279
-#-----
-#To install the RTAI deb's from NTULINUX git
-TMPDIR=$(mktemp -d)
-(
-    cd $TMPDIR
-    curl --no-progress-meter -fLO https://github.com/NTULINUX/RTAI/releases/download/v5.3.4/linux-headers-5.4.302-rtai-amd64_5.4.302-rtai-amd64-1_amd64.deb
-    curl --no-progress-meter -fLO https://github.com/NTULINUX/RTAI/releases/download/v5.3.4/linux-image-5.4.302-rtai-amd64_5.4.302-rtai-amd64-1_amd64.deb
-    curl --no-progress-meter -fLO https://github.com/NTULINUX/RTAI/releases/download/v5.3.4/rtai-modules-5.4.302_5.3.4-linuxcnc_amd64.deb
-)
-sudo dpkg -i \
-  $TMPDIR/linux-headers-5.4.302-rtai-amd64_5.4.302-rtai-amd64-1_amd64.deb \
-  $TMPDIR/linux-image-5.4.302-rtai-amd64_5.4.302-rtai-amd64-1_amd64.deb \
-  $TMPDIR/rtai-modules-5.4.302_5.3.4-linuxcnc_amd64.deb
-rm -rf $TMPDIR
-#-----
+if false; then
+    #To install the RTAI deb's from linuxcnc base
+    .github/scripts/add-linuxcnc-repository.sh "$DIST"
+    sudo apt-get --yes install linux-headers-5.4.279-rtai-amd64 linux-image-5.4.279-rtai-amd64 rtai-modules-5.4.279
+else
+    #To install the RTAI deb's from NTULINUX git
+    TMPDIR=$(mktemp -d)
+    (
+        cd "$TMPDIR"
+        curl --no-progress-meter -fLO https://github.com/NTULINUX/RTAI/releases/download/v5.3.4/linux-headers-5.4.302-rtai-amd64_5.4.302-rtai-amd64-1_amd64.deb
+        curl --no-progress-meter -fLO https://github.com/NTULINUX/RTAI/releases/download/v5.3.4/linux-image-5.4.302-rtai-amd64_5.4.302-rtai-amd64-1_amd64.deb
+        curl --no-progress-meter -fLO https://github.com/NTULINUX/RTAI/releases/download/v5.3.4/rtai-modules-5.4.302_5.3.4-linuxcnc_amd64.deb
+    )
+    sudo dpkg -i \
+    "$TMPDIR/linux-headers-5.4.302-rtai-amd64_5.4.302-rtai-amd64-1_amd64.deb" \
+    "$TMPDIR/linux-image-5.4.302-rtai-amd64_5.4.302-rtai-amd64-1_amd64.deb" \
+    "$TMPDIR/rtai-modules-5.4.302_5.3.4-linuxcnc_amd64.deb"
+    rm -rf "$TMPDIR"
+fi

.github/scripts/verify-clean-repo.sh

@@ -4,17 +4,17 @@ set -eu #Needed so CI fails when anything is wrong
 
 if [ $# -gt 0 ]; then
     #Arguments are pathspecs for git status, used to exclude files for this test
-    if [ -n "$(git status -u --porcelain -- $@)" ]; then
+    if [ -n "$(git status -u --porcelain -- "$@")" ]; then
         echo "Build produced untracked or modified files:----------------------------------------"
-        git status -u --porcelain -- $@
+        git status -u --porcelain -- "$@"
         echo "-----------------------------------------------------------------------------------"
-        echo "Pathspec is: \"$@\", withouth pathspec:--------------------------------------------"
+        echo "Pathspec is: \"$*\", withouth pathspec:--------------------------------------------"
         git status -u --porcelain
         echo "-----------------------------------------------------------------------------------"
         exit 1
     else
         echo Repo is clean
-        echo "Pathspec is: \"$@\", withouth pathspec:--------------------------------------------"
+        echo "Pathspec is: \"$*\", withouth pathspec:--------------------------------------------"
         git status -u --porcelain
         echo "-----------------------------------------------------------------------------------"
         exit 0

.github/workflows/ci.yml

@@ -158,9 +158,9 @@ jobs:
         set -x
         .github/scripts/build-doc.sh
     - name: Verify no untracked or modified files after build
-      continue-on-error: true #ToDo: Check what to do with the changed .po files
       run: |
-        .github/scripts/verify-clean-repo.sh
+        #*.po and documentation.pot are modifyed by build. Ignore them for now.
+        .github/scripts/verify-clean-repo.sh ':(exclude)docs/po/*.po' ':(exclude)docs/po/documentation.pot'
 
   package-arch:
     runs-on: ${{ matrix.runner }}
@@ -281,9 +281,9 @@ jobs:
         git config --global --add safe.directory ${PWD}
         .github/scripts/build-package-indep.sh
     - name: Verify no untracked or modified files after build
-      continue-on-error: true #ToDo: Check what to do with the changed .po files
       run: |
-        .github/scripts/verify-clean-repo.sh ':(exclude)VERSION' ':(exclude)debian/changelog'
+        #*.po and documentation.pot are modifyed by build. Ignore them for now.
+        .github/scripts/verify-clean-repo.sh ':(exclude)VERSION' ':(exclude)debian/changelog' ':(exclude)docs/po/*.po' ':(exclude)docs/po/documentation.pot'
     - name: Install debian packages
       run: |
         set -x