ci 2

adafruit · Aug 9, 2024 · a789c3e · a789c3e
1 parent 8754e2c
commit a789c3e
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 66 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ on:
       - created
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:
@@ -54,6 +54,7 @@ jobs:
   # Build ARM
   # ---------------------------------------
   arm:
+    if: false
     needs: set-matrix
     uses: ./.github/workflows/build_util.yml
     strategy:
@@ -82,7 +83,8 @@ jobs:
     uses: ./.github/workflows/build_util.yml
     with:
       port: 'espressif'
-      boards: ${{ toJSON(fromJSON(needs.set-matrix.outputs.json)['espressif'].board) }}
+      #boards: ${{ toJSON(fromJSON(needs.set-matrix.outputs.json)['espressif'].board) }}
+      boards: ${{ toJSON(["adafruit_feather_esp32s2"]) }}
       build-system: 'make'
       toolchain: 'esp-idf'
       toolchain_url: 'v5.1.1'
@@ -114,3 +116,41 @@ jobs:
     uses: ./.github/workflows/build_ghostfat.yml
     with:
         boards: ${{ toJSON(fromJSON(needs.set-matrix.outputs.json)['test_ghostfat'].board) }}
+
+  # ---------------------------------------
+  # Build ARM with CMake
+  # ---------------------------------------
+  arm-cmake:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        board:
+          # Alphabetical order by family
+          - 'metro_m7_1011'
+          # - 'stm32f303disco' # overflows flash
+          - 'stm32f411ve_discovery'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Fetch tags
+        run: git fetch --tags
+
+      - name: Install ARM GCC
+        uses: carlosperate/arm-none-eabi-gcc-action@v1
+        with:
+          release: '11.2-2022.02'
+
+      - name: Get Dependencies
+        run: |
+          sudo apt install -y ninja-build
+          python tools/get_deps.py --board ${{ matrix.board }}
+
+      - name: Build
+        run: |
+          cmake . -B _build -G Ninja -DCMAKE_BUILD_TYPE=MinSizeRel -DBOARD=${{ matrix.board }}
+          cmake --build _build
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
diff --git a/.github/workflows/build_util.yml b/.github/workflows/build_util.yml
@@ -32,7 +32,9 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: true
-          depth: 0
+
+      - name: Fetch tags
+        run: git fetch --tags
 
       - name: Setup Toolchain
         id: setup-toolchain
@@ -66,6 +68,8 @@ jobs:
       - name: Prepare Release Asset
         if: github.event_name == 'release'
         run: |
+          tree ${{ env.BIN_PATH }}/*
+          ls -al ${{ env.BIN_PATH }}/*
           for f in ${{ env.BIN_PATH }}/*; do mv $f ${f%.*}-${{ github.event.release.tag_name }}."${f#*.}"; done
           zip -jr tinyuf2-${{ matrix.board }}-${{ github.event.release.tag_name }}.zip ${{ env.BIN_PATH }}