Revert "provide DEB_DISTRO parameter more prominently"

This reverts commit 79a52dc.
v4hn · Aug 29, 2024 · e2c5957 · e2c5957
1 parent 79a52dc
commit e2c5957
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -9,10 +9,6 @@ on:
   schedule:
     - cron: '13 1 * * 2,6'
 
-env:
-  ROS_DISTRO: one
-  DEB_DISTRO: jammy
-
 jobs:
   ros-robot:
     uses: ./.github/workflows/debs-from-repos.yaml
@@ -57,6 +53,9 @@ jobs:
     needs: universe-2
     if: success() || failure() # can get cancelled
     runs-on: ubuntu-22.04
+    env:
+      ROS_DISTRO: one
+      DEB_DISTRO: jammy
     steps:
       - name: get apt packages from last job
         uses: actions/cache/restore@v4

diff --git a/.github/workflows/debs-from-repos.yaml b/.github/workflows/debs-from-repos.yaml
@@ -6,10 +6,25 @@ on:
       depends:
         type: string
 
+# json use example:
+#  test:
+#    needs: build
+#    strategy:
+#      matrix:
+#        include:
+#        - ${{ fromjson(inputs.build-config) }}
+#    runs-on: ubuntu-latest
+#    steps:
+#    - run: echo "$MATRIX"
+#      env:
+#        MATRIX: ${{ tojson(matrix) }}
+
 jobs:
   build:
     runs-on: ubuntu-22.04
     env:
+      ROS_DISTRO: one
+      DEB_DISTRO: jammy
       CCACHE_PATH: /home/runner/.cache/ccache
       SEGMENT_DOWNLOAD_TIMEOUT_MINS: 10
     steps: