Skip to content

Commit

Permalink
Merge pull request letscontrolit#5259 from tonhuisman/feature/Build-r…
Browse files Browse the repository at this point in the history
…unners-on-ubuntu-latest

[Build] Use build-runners on Ubuntu-latest
  • Loading branch information
TD-er authored Feb 20, 2025
2 parents aa55ee0 + 70cf4ea commit 6260306
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ concurrency:

jobs:
documentation:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand All @@ -45,7 +45,7 @@ jobs:
name: Documentation
path: ESPEasy_docs.zip
generate-matrix:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
Expand All @@ -60,7 +60,7 @@ jobs:
build:
needs: generate-matrix
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
strategy:
matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
steps:
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
# Package all ESP82xx and ESP32 into a single ESPEasy-all-Binaries-<date>_PR#<pr_nr>_<runnr>.zip
combine_package:
needs: build
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ permissions:

jobs:
generate-matrix:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
Expand All @@ -32,7 +32,7 @@ jobs:
build:
needs: generate-matrix
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
strategy:
matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
steps:
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:

prepare-dist:
needs: build
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
prepare-notes:
needs: build
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
outputs:
notes: ${{ steps.release-notes.outputs.result }}
steps:
Expand All @@ -136,7 +136,7 @@ jobs:
permissions:
contents: write # for ncipollo/release-action
needs: [build, prepare-dist, prepare-notes]
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/setup-python@v5
with:
Expand Down
6 changes: 5 additions & 1 deletion src/Custom-sample.h
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ static const char DATA_ESPEASY_DEFAULT_MIN_CSS[] PROGMEM = {
// #define USES_P041 // NeoPixel (Word Clock)
// #define USES_P042 // NeoPixel (Candle)
// #define USES_P043 // ClkOutput
// #define USES_P044 // P1 Wifi Gateway
// #define USES_P044 // P1 Wifi Gateway (Merged with P020, when P044 is enabled, then P020 is also enabled)
// #define USES_P045 // MPU6050
// #define USES_P046 // Ventus W266
// #define USES_P047 // Soil moisture sensor
Expand Down Expand Up @@ -517,7 +517,10 @@ static const char DATA_ESPEASY_DEFAULT_MIN_CSS[] PROGMEM = {
// #define P135_FEATURE_RESET_COMMANDS 1 // Enable/Disable quite spacious (~950 bytes) 'selftest' and 'factoryreset' subcommands
// #define USES_P137 // AXP192
// #define USES_P138 // IP5306
// #define USES_P139 // AXP2101

// #define USES_P140 // CardKB
// #define UN_USES_P140 // **DISABLE** I2C CardKB for ESP32 (Enabled by default for ESP32)
// #define USES_P141 // PCD8544 Nokia 5110 LCD
// #define USES_P142 // Position - AS5600
// #define USES_P143 // I2C Rotary encoders
Expand Down Expand Up @@ -554,6 +557,7 @@ static const char DATA_ESPEASY_DEFAULT_MIN_CSS[] PROGMEM = {
// #define USES_P173 // Environment - SHTC3
// #define USES_P175 // Dust - PMSx003i I2C
// #define USES_P176 // Communication - Victron VE.Direct
// #define USES_P178 // LU9685 Servo controller

/*
#######################################################################################################
Expand Down

0 comments on commit 6260306

Please sign in to comment.