From 629830540e6b8a245f2adfc3f666aa4134ae968c Mon Sep 17 00:00:00 2001 From: cyberman54 Date: Fri, 20 Jan 2023 22:21:26 +0100 Subject: [PATCH] testing --- .github/workflows/0build.yml | 32 ++++++++++---------------------- .github/workflows/build.yml | 2 +- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/.github/workflows/0build.yml b/.github/workflows/0build.yml index 1bd140be..44d61811 100644 --- a/.github/workflows/0build.yml +++ b/.github/workflows/0build.yml @@ -1,4 +1,4 @@ -name: PlatformIO CI +name: PlatformIO CI/CD on: pull_request: @@ -202,32 +202,22 @@ jobs: CI_HALFILE: ${{ matrix.board }} run: pio run -e ci - deploy: - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest] - include: - - os: ubuntu-latest - path: ~/.cache/pip - platformio-path: ~/.platformio - board: [ttgov21new.h] - - runs-on: ${{ matrix.os }} - + deploy-on-testboard: + name: Deploy code on ESP32 board TTGO v1.6.1 + runs-on: windows-latest steps: - uses: actions/checkout@v3 - name: Cache pip uses: actions/cache@v3 with: - path: ${{ matrix.path }} + path: ~\AppData\Local\pip\Cache key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - name: Cache PlatformIO uses: actions/cache@v3 with: - path: ${{ matrix.platformio-path }} + path: ~\AppData\Local\platformio\Cache key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} - name: Set up Python uses: actions/setup-python@v4 @@ -239,14 +229,12 @@ jobs: pip install --upgrade platformio - name: Copy of necessary files run: | - cp platformio_orig_s3.ini platformio.ini + cp platformio_orig.ini platformio.ini cp src/loraconf_sample.h src/loraconf.h cp src/ota_sample.conf src/ota.conf cp src/paxcounter_orig.conf src/paxcounter.conf - - name: Clean - run: pio run -t clean -e ci - - name: Build and deploy for ${{ matrix.board }} + - name: Build and deploy for ttgov21new.h env: - CI_HALFILE: ${{ matrix.board }} + CI_HALFILE: ttgov21new.h PLATFORMIO_AUTH_TOKEN: ${{ secrets.PLATFORMIO_AUTH_TOKEN }} - run: pio remote -a prenzlpi run -e cd -t upload -r \ No newline at end of file + run: pio remote -a prenzlpi run -e ci -t upload -r \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index faf1fa12..1acc40ad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,4 +54,4 @@ jobs: env: CI_HALFILE: ttgov21new.h PLATFORMIO_AUTH_TOKEN: ${{ secrets.PLATFORMIO_AUTH_TOKEN }} - run: pio remote -a prenzlpi run -t upload -r \ No newline at end of file + run: pio remote -a prenzlpi run -e ci -t upload -r \ No newline at end of file