Github Actions: improve the container matrix usage

5 years ago · 5b03f80376
3 changed files with 13 additions and 13 deletions
--- a/.github/workflows/bloaty.yml
+++ b/.github/workflows/bloaty.yml
@ -13,9 +13,9 @@ jobs:
				@@ -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:
				@@ -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:
--- a/.github/workflows/build_tests.yml
+++ b/.github/workflows/build_tests.yml
@ -13,11 +13,11 @@ jobs:
				@@ -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:
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@ -10,14 +10,14 @@ on:
				@@ -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: