From 5b03f80376f495dbb77942ab8becfc355fa4ad0a Mon Sep 17 00:00:00 2001
From: TSC21 <n.marques21@hotmail.com>
Date: Sun, 29 Mar 2020 19:44:07 +0100
Subject: [PATCH] Github Actions: improve the container matrix usage

---
 .github/workflows/bloaty.yml      |  8 ++++----
 .github/workflows/build_tests.yml |  8 ++++----
 .github/workflows/ccpp.yml        | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/bloaty.yml b/.github/workflows/bloaty.yml
index 309344bb49..73013cac64 100644
--- a/.github/workflows/bloaty.yml
+++ b/.github/workflows/bloaty.yml
@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        container: [
-          "px4io/px4-dev-nuttx-bionic:2020-03-29",
-          "px4io/px4-dev-nuttx-focal:2020-03-29"
+        ubuntu_release: [
+          bionic,
+          focal
           ]
         config: [
           px4_fmu-v2_default,
@@ -26,7 +26,7 @@ jobs:
           px4_fmu-v5x_default,
           px4_io-v2_default,
           ]
-    container: ${{ matrix.container }}
+    container: px4io/px4-dev-nuttx-${{ matrix.ubuntu_release }}:2020-03-29
     steps:
     - uses: actions/checkout@v1
       with:
diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml
index b517daba27..61c9ca762a 100644
--- a/.github/workflows/build_tests.yml
+++ b/.github/workflows/build_tests.yml
@@ -13,11 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        container: [
-          "px4io/px4-dev-base-bionic:2020-03-29",
-          "px4io/px4-dev-base-focal:2020-03-29"
+        ubuntu_release: [
+          bionic,
+          focal
           ]
-    container: ${{ matrix.container }}
+    container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-03-29
     steps:
     - uses: actions/checkout@v1
       with:
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index a6e92c28b8..3ed83063f8 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -10,14 +10,14 @@ on:
 
 jobs:
   build:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        container: [
-          "px4io/px4-dev-base-bionic:2020-03-29",
-          "px4io/px4-dev-base-focal:2020-03-29"
+        ubuntu_release: [
+          bionic,
+          focal
           ]
-    runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
+    container: px4io/px4-dev-base-${{ matrix.ubuntu_release }}:2020-03-29
     steps:
     - uses: actions/checkout@v1
       with: