From 79328d12ac43323cc2e6934d537a55535c324e7f Mon Sep 17 00:00:00 2001
From: Alejandro R Mosteo <amosteo@unizar.es>
Date: Mon, 11 May 2020 14:57:51 +0200
Subject: [PATCH] Clarify CI check environment (#112)

By adding an empty tag we don't need to show a fake docker on the platforms that are natively checked (windows/macos).
---
 .github/workflows/build-crate.yml | 11 +++++++++--
 scripts/gh-build-crate.sh         | 26 +++++++++++++-------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build-crate.yml b/.github/workflows/build-crate.yml
index 61ef106a..f0bda66f 100644
--- a/.github/workflows/build-crate.yml
+++ b/.github/workflows/build-crate.yml
@@ -8,7 +8,7 @@ on:
 jobs:
 
   build:
-    name: HOST:${{ matrix.os }} DOCK:${{ matrix.tag }}
+    name: ${{ matrix.os }}::${{ matrix.tag }}
 
     runs-on: ${{ matrix.os }}
 
@@ -19,23 +19,30 @@ jobs:
           - ubuntu-latest
           - windows-latest
         tag:
-          - centos-latest-community-2019
+          - centos-latest-community-latest
           - community-current          
           - debian-stable          
           - ubuntu-lts
+          - ""
         exclude: # inclusions don't allow to add arrays of values to a scenario
+          - os: ubuntu-latest
+            tag: ""
           - os: macos-latest
             tag: centos-latest-community-2019
           - os: macos-latest
             tag: community-current
           - os: macos-latest
             tag: debian-stable
+          - os: macos-latest
+            tag: ubuntu-lts
           - os: windows-latest
             tag: centos-latest-community-2019
           - os: windows-latest
             tag: community-current
           - os: windows-latest
             tag: debian-stable
+          - os: windows-latest
+            tag: ubuntu-lts
 
     steps:
     - name: Check out alire-index
diff --git a/scripts/gh-build-crate.sh b/scripts/gh-build-crate.sh
index 0a180048..9df7fbe6 100755
--- a/scripts/gh-build-crate.sh
+++ b/scripts/gh-build-crate.sh
@@ -49,31 +49,31 @@ for file in $CHANGES; do
    echo Testing crate: $crate
 
    # Show info for the record
-   echo PLATFORM-INDEPENDENT CRATE INFO
+   echo PLATFORM-INDEPENDENT CRATE INFO $crate
    alr show $crate
    alr show --external $crate
    alr show --external-detect $crate
 
-   echo PLATFORM-DEPENDENT CRATE INFO
+   echo PLATFORM-DEPENDENT CRATE INFO $crate
    alr show --system $crate
    alr show --external --system $crate
    alr show --external-detect --system $crate
    crateinfo=$(alr show --external-detect --system $crate)
 
-   echo CRATE DEPENDENCIES
+   echo CRATE DEPENDENCIES $crate
    alr show --solve --detail --external-detect $crate
    solution=$(alr show --solve --detail --external-detect $crate)
 
    # Skip on explicit unavailability
    if alr show --system $crate | grep -q 'Available when: False'; then
-      echo SKIPPING crate build: UNAVAILABLE on system
+      echo SKIPPING crate build: $crate UNAVAILABLE on system
       continue
    fi
 
    # In unsupported platforms, externals are properly reported as missing. We
    # can skip testing of such a crate since it will likely fail.
    if grep -q 'Dependencies (external):' <<< $solution ; then
-      echo SKIPPING build for crate with MISSING external dependencies
+      echo SKIPPING build for crate $crate with MISSING external dependencies
       continue
    fi
 
@@ -90,37 +90,37 @@ for file in $CHANGES; do
    # Alternatives for when the crate itself comes from an external. Only system
    # externals should be tested.
    if grep -q 'Origin: external path' <<< $crateinfo ; then
-      echo SKIPPING detected external crate
+      echo SKIPPING detected external crate $crate
       continue
    elif grep -q 'Origin: system package' <<< $crateinfo ; then
-      echo INSTALLING detected system crate
+      echo INSTALLING detected system crate $crate
       is_system=true
    elif grep -q 'Not found:' <<< $crateinfo && \
         grep -q 'There are external definitions' <<< $crateinfo
    then
-      echo SKIPPING undetected external crate
+      echo SKIPPING undetected external crate $crate
       continue
    fi
 
    # Detect missing dependencies for clearer error
    if grep -q 'Dependencies cannot be met' <<< $solution ; then
-      echo FAIL: crate dependencies cannot be met
+      echo FAIL: crate $crate dependencies cannot be met
       exit 1
    fi
    
    # Actual checks
-   echo DEPLOYING CRATE
+   echo DEPLOYING CRATE $crate
    alr get -d --build -n $crate
 
    if $is_system; then 
-      echo DETECTING INSTALLED PACKAGE
+      echo DETECTING INSTALLED PACKAGE via crate $crate
       alr show -d --external-detect $crate
    else
-      echo LISTING EXECUTABLES
+      echo LISTING EXECUTABLES of crate $crate
       cd ${crate}_*
       alr run -d --list
       cd ..
    fi
 
-   echo CRATE BUILD ENDED SUCCESSFULLY
+   echo CRATE $crate TEST ENDED SUCCESSFULLY
 done