provide DEB_DISTRO parameter more prominently

v4hn · Aug 29, 2024 · 79a52dc · 79a52dc
1 parent 8bfd2cd
commit 79a52dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -9,6 +9,10 @@ on:
   schedule:
     - cron: '13 1 * * 2,6'
 
+env:
+  ROS_DISTRO: one
+  DEB_DISTRO: jammy
+
 jobs:
   ros-robot:
     uses: ./.github/workflows/debs-from-repos.yaml
@@ -53,9 +57,6 @@ 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,25 +6,10 @@ 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: