diff --git a/.github/actions/prepare_pio.yml b/.github/actions/prepare_pio.yml deleted file mode 100644 index 630baa5..0000000 --- a/.github/actions/prepare_pio.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Prepare PIO environment - -on: [workflow_call] - -jobs: - prepare_pio: - name: Set up PIO environment - runs-on: ubuntu-latest - steps: - - uses: actions/cache@v4 - with: - path: | - ~/.cache/pip - ~/.platformio/.cache - key: ${{ runner.os }}-pio - - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - name: Install PlatformIO Core - run: pip install --upgrade platformio \ No newline at end of file diff --git a/.github/actions/prepare_pio/action.yml b/.github/actions/prepare_pio/action.yml new file mode 100644 index 0000000..bcb3042 --- /dev/null +++ b/.github/actions/prepare_pio/action.yml @@ -0,0 +1,19 @@ +name: Prepare PIO environment + +on: [workflow_call] + +runs: + using: "composite" + steps: + - uses: actions/cache@v4 + with: + path: | + ~/.cache/pip + ~/.platformio/.cache + key: pisos-pio + - uses: actions/setup-python@v5 + with: + python-version: '3.11' + - name: Install PlatformIO Core + shell: bash + run: pip install --upgrade platformio \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e13fbc0..a5fd6a4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,7 +2,7 @@ name: Build production version on: push: - branches: [main] + branches: [main, develop] jobs: build-everything: @@ -15,6 +15,12 @@ jobs: fetch-depth: 0 - name: Prepare environment uses: ./.github/actions/prepare_pio + - name: Download AquesTalk + run: | + wget https://www.a-quest.com/archive/package/aquestalk-esp32_0243.zip -O /tmp/aquestalk.zip + unzip /tmp/aquestalk.zip -d /tmp + mv /tmp/aquestalk-esp32/src/esp32/libaquestalk.a ./lib/nonfree-aquestalk/libaquestalk.a + mv /tmp/aquestalk-esp32/aquestalk.h ./lib/nonfree-aquestalk/aquestalk.h - name: Build all targets run: pio run continue-on-error: true # TODO make this more graceful