Convert stm32-blink to SwiftPM

.github/actions/install-swift/action.yml

@@ -4,16 +4,11 @@ description: Installs the Swift specified by a .swift-version file
 runs:
   using: "composite"
   steps:
-    # - name: "Cache: Swift"
-    #   id: cache-swift
-    #   uses: actions/cache@v4
-    #   with:
-    #     path: "$HOME/.local/share/swiftly"
-    #     key: swift-${{ hashFiles('.swift-version') }}
-
     - name: Setup Environment
       shell: bash
       run: |
+        mkdir -p "$HOME/.local/share"
+
         export SWIFTLY_HOME_DIR="$HOME/.local/share/swiftly"
         echo "SWIFTLY_HOME_DIR=$SWIFTLY_HOME_DIR" >> $GITHUB_ENV
         echo "SWIFTLY_HOME_DIR=$SWIFTLY_HOME_DIR" >> $HOME/.bashrc
@@ -22,18 +17,22 @@ runs:
         echo "SWIFTLY_BIN_DIR=$SWIFTLY_BIN_DIR" >> $GITHUB_ENV
         echo "SWIFTLY_BIN_DIR=$SWIFTLY_BIN_DIR" >> $HOME/.bashrc
 
+        export SWIFTLY_TOOLCHAINS_DIR="$HOME/.local/share/swiftly/toolchains"
+        echo "SWIFTLY_TOOLCHAINS_DIR=$SWIFTLY_TOOLCHAINS_DIR" >> $GITHUB_ENV
+        echo "SWIFTLY_TOOLCHAINS_DIR=$SWIFTLY_TOOLCHAINS_DIR" >> $HOME/.bashrc
+
         echo "PATH=$SWIFTLY_BIN_DIR:$PATH" >> $GITHUB_ENV
         echo "PATH=\$SWIFTLY_BIN_DIR:\$PATH" >> $HOME/.bashrc
 
-    - name: "Restore: Swift"
+    - name: Restore Swift
       uses: actions/cache/restore@v4
       id: cache-swift
       with:
         path: "~/.local/share/swiftly"
-        key: swift-${{ hashFiles('**/.swift-version') }}
+        key: swift-${{ runner.os }}-${{ hashFiles('**/.swift-version', '.github/actions/install-swift/action.yml') }}
 
     - name: Install `apt` Dependencies
-      if: steps.cache-swift.outputs.cache-hit != 'true'
+      if: runner.os == 'Linux' && steps.cache-swift.outputs.cache-hit != 'true'
       shell: bash
       run: |
         SUDO=$(if [[ $EUID -ne 0 ]]; then echo sudo; fi)
@@ -43,29 +42,47 @@ runs:
         DEBIAN_FRONTEND: noninteractive
 
     - name: Install Swiftly
-      if: steps.cache-swift.outputs.cache-hit != 'true'
+      if: runner.os == 'Linux' && steps.cache-swift.outputs.cache-hit != 'true'
       shell: bash
       run: |
+        SWIFTLY_VERSION=1.0.1
         UNAME=$(uname -m)
-        curl -O "https://download.swift.org/swiftly/linux/swiftly-$UNAME.tar.gz"
-        tar zxf "swiftly-$UNAME.tar.gz"
+        SWIFTLY_TGZ=swiftly-$SWIFTLY_VERSION-$UNAME.tar.gz
+        curl -O "https://download.swift.org/swiftly/linux/$SWIFTLY_TGZ"
+        tar zxf "$SWIFTLY_TGZ"
         ./swiftly init \
           --skip-install \
           --assume-yes \
           --quiet-shell-followup \
           --no-modify-profile
 
+    - name: Install Swiftly
+      if: runner.os == 'macOS' && steps.cache-swift.outputs.cache-hit != 'true'
+      shell: bash
+      run: |
+        SWIFTLY_VERSION=1.0.1
+        SWIFTLY_PKG=swiftly-$SWIFTLY_VERSION.pkg
+        curl -O "https://download.swift.org/swiftly/darwin/$SWIFTLY_PKG"
+        pkgutil --check-signature $SWIFTLY_PKG
+        pkgutil --verbose --expand $SWIFTLY_PKG $SWIFTLY_HOME_DIR
+        tar -C $SWIFTLY_HOME_DIR -xvf $SWIFTLY_HOME_DIR/swiftly-*/Payload
+        "$SWIFTLY_BIN_DIR/swiftly" init \
+          --skip-install \
+          --assume-yes \
+          --quiet-shell-followup \
+          --no-modify-profile
+
     - name: Install Swift
       if: steps.cache-swift.outputs.cache-hit != 'true'
       shell: bash
       run: swiftly install --post-install-file ./out.sh
 
-    - name: "Save: Swift"
+    - name: Save Swift
       if: steps.cache-swift.outputs.cache-hit != 'true'
       uses: actions/cache/save@v4
       with:
         path: "~/.local/share/swiftly"
-        key: swift-${{ hashFiles('**/.swift-version') }}
+        key: swift-${{ runner.os }}-${{ hashFiles('**/.swift-version', '.github/actions/install-swift/action.yml') }}
 
     - name: Print Swift Version
       shell: bash

.github/workflows/build-esp.yml

@@ -3,8 +3,8 @@ name: ESP
 on:
   push:
     branches: ["main"]
-  pull_request:
-    types: [opened, reopened, synchronize, ready_for_review]
+  # pull_request:
+  #   types: [opened, reopened, synchronize, ready_for_review]
   workflow_dispatch:
 
 jobs:

.github/workflows/build-nuttx.yml

@@ -3,8 +3,8 @@ name: NuttX
 on:
   push:
     branches: ["main"]
-  pull_request:
-    types: [opened, reopened, synchronize, ready_for_review]
+  # pull_request:
+  #   types: [opened, reopened, synchronize, ready_for_review]
   workflow_dispatch:
 
 jobs:

.github/workflows/build-rpi-baremetal.yml

@@ -3,8 +3,8 @@ name: Raspberry Pi Baremetal
 on:
   push:
     branches: ["main"]
-  pull_request:
-    types: [opened, reopened, synchronize, ready_for_review]
+  # pull_request:
+  #   types: [opened, reopened, synchronize, ready_for_review]
   workflow_dispatch:
 
 jobs:

.github/workflows/build-rpi-pico-sdk.yml

@@ -3,8 +3,8 @@ name: Raspberry Pi Pico SDK
 on:
   push:
     branches: ["main"]
-  pull_request:
-    types: [opened, reopened, synchronize, ready_for_review]
+  # pull_request:
+  #   types: [opened, reopened, synchronize, ready_for_review]
   workflow_dispatch:
 
 jobs:

.github/workflows/build-stm.yml → .github/workflows/build-stm32-elf.yml

@@ -1,10 +1,10 @@
-name: STM32
+name: STM32 ELF
 
 on:
   push:
     branches: ["main"]
-  pull_request:
-    types: [opened, reopened, synchronize, ready_for_review]
+  # pull_request:
+  #   types: [opened, reopened, synchronize, ready_for_review]
   workflow_dispatch:
 
 jobs:
@@ -15,16 +15,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        example: [stm32-blink, stm32-lvgl]
+        example: [stm32-lvgl]
 
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - name: Fixup for running locally in act
-        if: ${{ env.ACT }}
-        run: echo /opt/acttoolcache/node/18.20.8/x64/bin >> $GITHUB_PATH
-
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -36,21 +32,13 @@ jobs:
       - name: Install Swift
         uses: ./.github/actions/install-swift
 
-      - name: Set environment variables
-        run: |
-          echo "STM_BOARD=STM32F746G_DISCOVERY" >> $GITHUB_ENV
-
       - name: Build ${{ matrix.example }}
         working-directory: ${{ matrix.example }}
         run: |
           if [[ -f ./fetch-dependencies.sh ]]; then
             ./fetch-dependencies.sh
           fi
 
-          if [[ -f ./build-elf.sh ]]; then
-            ./build-elf.sh
-          fi
-
           if [[ -f Makefile ]]; then
             make
           fi

.github/workflows/build-stm32-macho.yml

@@ -0,0 +1,37 @@
+name: STM32 Macho
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    types: [opened, reopened, synchronize, ready_for_review]
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build
+    runs-on: [self-hosted, macos, sequoia, ARM64]
+
+    strategy:
+      fail-fast: false
+      matrix:
+        example: [stm32-blink] #, stm32-lcd-logo, stm32-neopixel, stm32-uart-echo]
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.11
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Install Swift
+        uses: ./.github/actions/install-swift
+
+      - name: Build ${{ matrix.example }}
+        working-directory: ${{ matrix.example }}
+        run: make

.github/workflows/build-zephyr.yml

@@ -3,8 +3,8 @@ name: Zephyr
 on:
   push:
     branches: ["main"]
-  pull_request:
-    types: [opened, reopened, synchronize, ready_for_review]
+  # pull_request:
+  #   types: [opened, reopened, synchronize, ready_for_review]
   workflow_dispatch:
 
 jobs:

.github/workflows/lint.yml

@@ -3,8 +3,8 @@ name: Lint
 on:
   push:
     branches: ["main"]
-  pull_request:
-    types: [opened, reopened, synchronize, ready_for_review]
+  # pull_request:
+  #   types: [opened, reopened, synchronize, ready_for_review]
   workflow_dispatch:
 
 jobs:

.swiftformatignore

@@ -1,6 +1,7 @@
 ./harmony/*
-./stm32-lvgl/*
+./stm32-blink/Sources/STM32F7X6/*
 ./stm32-lcd-logo/Sources/STM32F7X6/*
+./stm32-lvgl/*
 ./stm32-lvgl/Sources/Registers/*
 ./stm32-neopixel/Sources/STM32F7X6/*
 ./stm32-uart-echo/Sources/STM32F7X6/*