Update release.yml

smarc-project · Feb 10, 2021 · 65ca082 · 65ca082
1 parent 85103f9
commit 65ca082
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,24 +7,33 @@ on:
 
 jobs:
   release_build:
+      strategy:
+        matrix:
+          include:
+            - distro: melodic
+              ubuntu: bionic
+              bloom: python-bloom
+            - distro: noetic
+              ubuntu: focal
+              bloom: python3-bloom
       runs-on: ubuntu-latest
       container:
-        image: rostooling/setup-ros-docker:ubuntu-bionic-ros-melodic-ros-base-latest
+        image: rostooling/setup-ros-docker:ubuntu-${{ matrix.ubuntu }}-ros-${{ matrix.distro }}-ros-base-latest
         #options: -u root  # setup-node requires root access
       steps:
       - uses: actions/checkout@v2
         with:
           path: '.'
       - name: Setup environment
         run: |
-          sudo curl https://raw.githubusercontent.com/smarc-project/rosinstall/master/sources.list.d/smarc-latest.list -o /etc/apt/sources.list.d/smarc-latest.list
-          sudo curl https://raw.githubusercontent.com/smarc-project/rosinstall/master/rosdep/50-smarc.list -o /etc/ros/rosdep/sources.list.d/50-smarc.list  
+          sudo curl https://raw.githubusercontent.com/smarc-project/rosinstall/master/sources.list.d/smarc-${{ matrix.distro }}-latest.list -o /etc/apt/sources.list.d/smarc-latest.list
+          sudo curl https://raw.githubusercontent.com/smarc-project/rosinstall/master/rosdep/50-smarc-${{ matrix.distro }}.list -o /etc/ros/rosdep/sources.list.d/50-smarc.list  
           sudo apt update
           rosdep update
       - name: Install deps
         run: |
           ls
-          sudo apt install -y python-bloom fakeroot dpkg-dev debhelper zip
+          sudo apt install -y ${{ matrix.bloom }} fakeroot dpkg-dev debhelper zip
       - name: Build package
         run: |
           mkdir bloom-release-debs
@@ -33,21 +42,21 @@ jobs:
             echo "Doing ${pkg}"
             cd $pkg
             ls
-            rosdep install --from-path . --ignore-src --rosdistro melodic -y
-            bloom-generate rosdebian --os-name ubuntu --os-version bionic --ros-distro melodic
+            rosdep install --from-path . --ignore-src --rosdistro ${{ matrix.distro }} -y
+            bloom-generate rosdebian --os-name ubuntu --os-version ${{ matrix.ubuntu }} --ros-distro ${{ matrix.distro }}
             fakeroot debian/rules binary
             cd ..
-            sudo dpkg -i ros-melodic-*.deb
-            mv ros-melodic-*.deb bloom-release-debs
+            sudo dpkg -i ros-${{ matrix.distro }}-*.deb
+            mv ros-${{ matrix.distro }}-*.deb bloom-release-debs
           done < release_packages.yaml
-          zip -j bloom-release-deb.zip bloom-release-debs/*
+          zip -j bloom-${{ matrix.distro }}-release-deb.zip bloom-release-debs/*
           ls
       - name: Upload binaries to release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ./bloom-release-deb.zip
-          asset_name: bloom-release-deb.zip
+          file: ./bloom-${{ matrix.distro }}-release-deb.zip
+          asset_name: bloom-${{ matrix.distro }}-release-deb.zip
           tag: ${{ github.ref }}
           overwrite: true
           body: "Debian release generated using bloom"