Merge remote-tracking branch 'autobuild/devel' into testing

Author: 2maz

Diff for: .github/workflows/test.yml

@@ -0,0 +1,19 @@
+name: ubuntu-20.04
+on: [push]
+jobs:
+  unittests:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Branch name
+        shell: bash
+        run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
+        id: current_branch
+
+      - name: Build 20.04
+        run: docker build -t apaka/ubuntu-20.04 -f Dockerfile.ubuntu-20.04 . --build-arg PKG_BRANCH=${{ steps.current_branch.outputs.branch }}
+
+      - name: Test-on-ubuntu:20.04
+        run: docker run --privileged apaka/ubuntu-20.04 /bin/sh -c "cd /home/docker/apaka/; BUNDLE_GEMFILE=/home/docker/apaka/test/workspace/.autoproj/Gemfile rake test"

Diff for: .github/workflows/test_ubuntu-20.04.yml

@@ -0,0 +1,19 @@
+name: ubuntu-22.04
+on: [push]
+jobs:
+  unittests:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Branch name
+        shell: bash
+        run: echo "branch=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT
+        id: current_branch
+
+      - name: Build 22.04
+        run: docker build -t apaka/ubuntu-22.04 -f Dockerfile.ubuntu-22.04 . --build-arg PKG_BRANCH=${{ steps.current_branch.outputs.branch }}
+
+      - name: Test-on-ubuntu:22.04
+        run: docker run --privileged apaka/ubuntu-22.04 /bin/sh -c "cd /home/docker/apaka/; BUNDLE_GEMFILE=/home/docker/apaka/test/workspace/.autoproj/Gemfile rake test"

Diff for: .github/workflows/test_ubuntu-22.04.yml

@@ -1,6 +1,6 @@
 # apaka: Automated PAcKaging for Autoproj
-[![Build Status](https://github.com/rock-core/tools-apaka/actions/workflows/test.yml/badge.svg?branch=testing)](https://github.com/rock-core/tools-apaka/actions/workflows/test.yml)
-
+[![ubuntu-20.04](https://github.com/rock-core/tools-apaka/actions/workflows/test_ubuntu-20.04.yml/badge.svg)](https://github.com/rock-core/tools-apaka/actions/workflows/test_ubuntu-20.04.yml)
+[![ubuntu-22.04](https://github.com/rock-core/tools-apaka/actions/workflows/test_ubuntu-22.04.yml/badge.svg)](https://github.com/rock-core/tools-apaka/actions/workflows/test_ubuntu-22.04.yml)
 
 * https://github.com/rock-core/tools-apaka
 

Diff for: README.md

@@ -561,7 +561,7 @@ def dependencies(pkg, with_rock_release_prefix = true)
                                 version = $1
                             end
 
-                            name = name.gsub(/[<>=]=?.*$/,"")
+                            name = name.gsub(/[ <>=]=?.*$/,"")
 
                             extra_gems << [name, version]
                             non_native_dependencies << [name, version]

Diff for: lib/apaka/packaging/autoproj2adaptor.rb

@@ -1,5 +1,5 @@
 #!/bin/sh
-set -ex
+set -e
 
 echo "Reading pbuilder /etc/pbuilderrc"
 
@@ -9,13 +9,17 @@ DEBIAN_DISTS="sid wheezy jessie stretch buster bullseye bookworm"
 # debhelper-compat required with Starting with bulleye and focal
 DIST_REQUIRES_NO_DEBHELPER="trusty vivid wily xenial yakkety zesty artful bionic wheezy jessie stretch buster"
 
-if [ "x${DIST}" = "x" ] && [ "x${DISTRIBUTION}" != "x" ]; then
+if [ -z ${DIST} ] && [ -n ${DISTRIBUTION} ]; then
     echo "warning: DIST is not set, using DISTRIBUTION=${DISTRIBUTION}"
     DIST=$DISTRIBUTION
-elif [ "x${DIST}" != "x" ] && [ "x${DISTRIBUTION}" = "x" ]; then
+elif [ -n ${DIST} ] && [ -n ${DISTRIBUTION} ]; then
+    echo "warning: DIST (${DIST}) and DISTRIBUTION (${DISTRIBUTION}) are both set. The value of DIST will be used."
+    DISTRIBUTION=$DIST
+elif [ -n ${DIST} ] && [ -z ${DISTRIBUTION} ]; then
     echo "warning: DISTRIBUTION is not set, using DIST=${DIST}"
     DISTRIBUTION=$DIST
-elif [ "x${DIST}" = "x" ] && [ "x${DISTRIBUTION}" = "x" ]; then
+else
+    # no default distribution, let it fail
     DIST=$(lsb_release -sc)
     echo "warning: no distribution set -- using default: ${DIST}"
 fi
@@ -47,8 +51,8 @@ if [ "$DIST_TYPE" == "ubuntu" ]; then
         # The port mirror site provides arm64, armel, armhf
         MIRRORSITE=http://ports.ubuntu.com/ubuntu-ports
     fi
-    
-    OTHERMIRROR="deb $MIRRORSITE $DIST-updates $COMPONENTS"    
+
+    OTHERMIRROR="deb $MIRRORSITE $DIST-updates $COMPONENTS"
     DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" --components=main,restricted,universe,multiverse)
     EXTRA_PACKAGES+="ruby-all-dev,"
 
@@ -94,7 +98,7 @@ fi
 EXTRA_PACKAGES+="apt,apt-utils,cmake,dh-autoreconf,libgl1-mesa-dev,libboost-dev,yard,gem2deb,perl-openssl-defaults"
 DEBOOTSTRAPOPTS+=("--include=$EXTRA_PACKAGES")
 
-echo "DIST: ${DIST}"
+echo "DISTRIBUTION: ${DISTRIBUTION} (DIST: ${DIST})"
 echo "ARCH: ${ARCH}"
 echo "COMPONENTS: ${COMPONENTS}"
 echo "DIST_TYPE: ${DIST_TYPE}"