Merge branch 'master' into dev

This commit is contained in:
BitMaker 2023-10-05 23:59:44 +02:00 committed by GitHub
commit ed3358533a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions

View File

@ -1,6 +1,9 @@
name: PlatformIO CI name: PlatformIO CI
on: [push] on:
push:
branches:
- master
jobs: jobs:
build: build:
@ -27,4 +30,4 @@ jobs:
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: builded artifacts name: builded artifacts
path: .pio/build/* path: .pio/build/*/*.bin

View File

@ -12,7 +12,7 @@
globallib_dir = lib globallib_dir = lib
default_envs = esp32cam, ESP32-2432S028R, NerminerV2, ESP32-devKitv1, NerminerV2-S3-DONGLE, NerminerV2-S3-AMOLED, NerminerV2-T-QT, NerdminerV2-T-Display_V1, ESP32-2432S028R default_envs = esp32cam, ESP32-2432S028R, NerminerV2, ESP32-devKitv1, NerminerV2-S3-DONGLE, NerminerV2-S3-AMOLED, NerminerV2-T-QT, NerdminerV2-T-Display_V1, ESP32-2432S028R
;--------------------------------------------------------------------
[env:NerminerV2] [env:NerminerV2]
platform = espressif32 platform = espressif32