diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb5ab38..cc4654b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,6 +16,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + submodules: true - name: Install Arduino CLI uses: arduino/setup-arduino-cli@81d310742121c928ea9c8bbd407b4217b432ae02 # v2.0.0 @@ -23,17 +25,8 @@ jobs: - name: Initialize Arduino CLI run: | arduino-cli config init - arduino-cli config set library.enable_unsafe_install true arduino-cli core update-index - - - name: Install required board core - run: arduino-cli core install arduino:avr@1.8.7 - - - name: Install libraries - run: | - arduino-cli lib install "AM2302-Sensor@1.4.0" - arduino-cli lib install --git-url https://github.com/Zefek/MQTTESP8266.git#6.0 - + - name: Set configs run: | cp config_default.h config.h @@ -41,4 +34,4 @@ jobs: - name: Compile Arduino project run: | - arduino-cli compile --fqbn arduino:avr:uno ./ + arduino-cli compile --profile Garage_UNO ./ diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 0b5cd7a..6867e51 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -16,21 +16,12 @@ jobs: - name: Checkout repository uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + submodules: true - name: Initialize Arduino CLI run: | & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" core update-index - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" config set library.enable_unsafe_install true - - - name: Install required board core - run: | - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" core install arduino:avr@1.8.7 - - - name: Install custom Arduino libraries (Windows) - shell: powershell - run: | - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" lib install --git-url https://github.com/Zefek/MQTTESP8266.git#6.0 - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" lib install "AM2302-Sensor@1.4.0" - name: Generate configs from secrets repo shell: powershell @@ -78,7 +69,7 @@ jobs: - name: Compile Arduino project run: | - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" compile --fqbn arduino:avr:uno ./ --output-dir build + & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" compile --profile Garage_UNO ./ --output-dir build - name: Upload firmware to Arduino env: @@ -88,4 +79,4 @@ jobs: Write-Error "Invalid serial port format: $env:SERIAL_PORT" exit 1 } - & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" upload --fqbn arduino:avr:uno --port $env:SERIAL_PORT --input-dir build + & "$Env:RUNNER_TOOL_CACHE\arduino-cli\arduino-cli.exe" --config-file "$Env:RUNNER_TOOL_CACHE\arduino-cli\config.yaml" upload --profile Garage_UNO --port $env:SERIAL_PORT --input-dir build diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..f2db511 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "MQTTESP8266"] + path = MQTTESP8266 + url = https://github.com/Zefek/MQTTESP8266.git + branch = 6.0 diff --git a/MQTTESP8266 b/MQTTESP8266 new file mode 160000 index 0000000..0fc63a7 --- /dev/null +++ b/MQTTESP8266 @@ -0,0 +1 @@ +Subproject commit 0fc63a725df0f208de012f7cbcc4f4243d4a72ad diff --git a/sketch.yaml b/sketch.yaml new file mode 100644 index 0000000..687fc4f --- /dev/null +++ b/sketch.yaml @@ -0,0 +1,9 @@ +profiles: + Garage_UNO: + fqbn: arduino:avr:uno + platforms: + - platform: arduino:avr (1.8.7) + libraries: + - AM2302-Sensor (1.4.0) + - dir: MQTTESP8266 +default_profile: Garage_UNO