rename build_family.yml to build_util.yml

hathach · May 10, 2024 · 66c80dc · 66c80dc
1 parent 64b6b85
commit 66c80dc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -12,7 +12,7 @@ on:
       - 'tools/build.py'
       - '.github/actions/**'
       - '.github/workflows/build_cmake.yml'
-      - '.github/workflows/build_family.yml'
+      - '.github/workflows/build_util.yml'
       - '.github/workflows/ci_set_matrix.py'
   pull_request:
     branches: [ master ]
@@ -25,7 +25,7 @@ on:
       - 'tools/build.py'
       - '.github/actions/**'
       - '.github/workflows/build_cmake.yml'
-      - '.github/workflows/build_family.yml'
+      - '.github/workflows/build_util.yml'
       - '.github/workflows/ci_set_matrix.py'
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -57,7 +57,7 @@ jobs:
   # ---------------------------------------
   cmake:
     needs: set-matrix
-    uses: ./.github/workflows/build_family.yml
+    uses: ./.github/workflows/build_util.yml
     strategy:
       fail-fast: false
       matrix:
@@ -71,14 +71,14 @@ jobs:
       build-system: 'cmake'
       toolchain: ${{ matrix.toolchain }}
       toolchain_url: ${{ fromJSON(needs.set-matrix.outputs.json)[matrix.toolchain].toolchain_url }}
-      build-family: ${{ toJSON(fromJSON(needs.set-matrix.outputs.json)[matrix.toolchain].family) }}
+      build-args: ${{ toJSON(fromJSON(needs.set-matrix.outputs.json)[matrix.toolchain].family) }}
 
   # ---------------------------------------
   # Build Make
   # ---------------------------------------
   make:
     needs: set-matrix
-    uses: ./.github/workflows/build_family.yml
+    uses: ./.github/workflows/build_util.yml
     strategy:
       fail-fast: false
       matrix:
@@ -92,13 +92,13 @@ jobs:
       build-system: 'make'
       toolchain: ${{ matrix.toolchain }}
       toolchain_url: ${{ fromJSON(needs.set-matrix.outputs.json)[matrix.toolchain].toolchain_url }}
-      build-family: ${{ toJSON(fromJSON(needs.set-matrix.outputs.json)[matrix.toolchain].family) }}
+      build-args: ${{ toJSON(fromJSON(needs.set-matrix.outputs.json)[matrix.toolchain].family) }}
 
   # ---------------------------------------
   # Build Make on Windows/MacOS
   # ---------------------------------------
   make-os:
-    uses: ./.github/workflows/build_family.yml
+    uses: ./.github/workflows/build_util.yml
     strategy:
       fail-fast: false
       matrix:
@@ -107,4 +107,4 @@ jobs:
       os: ${{ matrix.os }}
       build-system: 'make'
       toolchain: 'arm-gcc'
-      build-family: '-b stm32f411disco'
+      build-args: ${{ toJSON('-b stm32f411disco') }}
diff --git a/.github/workflows/build_family.yml → .github/workflows/build_util.yml b/.github/workflows/build_family.yml → .github/workflows/build_util.yml
@@ -1,4 +1,4 @@
-name: Reusable build family
+name: Reusable build util
 
 on:
   workflow_call:
@@ -12,7 +12,7 @@ on:
       toolchain_url:
         required: false
         type: string
-      build-family:
+      build-args:
         required: true
         type: string
       os:
@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        family: ${{ fromJSON(inputs.build-family) }}
+        arg: ${{ fromJSON(inputs.build-args) }}
     steps:
       - name: Checkout TinyUSB
         uses: actions/checkout@v4
@@ -43,7 +43,7 @@ jobs:
           toolchain_url: ${{ inputs.toolchain_url }}
 
       - name: Checkout pico-sdk for rp2040
-        if: contains(matrix.family, 'rp2040')
+        if: contains(matrix.arg, 'rp2040')
         uses: actions/checkout@v4
         with:
           repository: raspberrypi/pico-sdk
@@ -53,7 +53,7 @@ jobs:
       - name: Get Dependencies
         run: |
           sudo apt install -y ninja-build
-          python3 tools/get_deps.py ${{ matrix.family }}
+          python3 tools/get_deps.py ${{ matrix.arg }}
 
       - name: Build
         run: |
@@ -62,6 +62,6 @@ jobs:
             OPTION="--toolchain clang"
           fi
           echo "OPTION=$OPTION"
-          python tools/build.py -s ${{ inputs.build-system }} $OPTION ${{ matrix.family }}
+          python tools/build.py -s ${{ inputs.build-system }} $OPTION ${{ matrix.arg }}
         env:
           PICO_SDK_PATH: ${{ github.workspace }}/pico-sdk