diff --git a/.github/workflows/pre_release.yml b/.github/workflows/dev_release.yml similarity index 90% rename from .github/workflows/pre_release.yml rename to .github/workflows/dev_release.yml index 966fec4d4..3564cb955 100644 --- a/.github/workflows/pre_release.yml +++ b/.github/workflows/dev_release.yml @@ -10,7 +10,7 @@ on: jobs: pre-release: - name: 'Automatic pre-release build' + name: 'Build Dev Release' runs-on: ubuntu-latest steps: @@ -19,10 +19,10 @@ jobs: with: python-version: '3.13' - - name: Install Node.js 20 + - name: Install Node.js 22 uses: actions/setup-node@v4 with: - node-version: '20.x' + node-version: 22 - name: Checkout repository uses: actions/checkout@v4 @@ -50,7 +50,7 @@ jobs: pnpm build pnpm webUI - - name: Build all PIO target environments from default_envs + - name: Build all PIO target environments run: | platformio run env: diff --git a/.github/workflows/tagged_release.yml b/.github/workflows/stable_release.yml similarity index 70% rename from .github/workflows/tagged_release.yml rename to .github/workflows/stable_release.yml index 70817cad5..fad615fd3 100644 --- a/.github/workflows/tagged_release.yml +++ b/.github/workflows/stable_release.yml @@ -8,40 +8,41 @@ on: jobs: tagged-release: - name: 'Tagged Release' + name: 'Build Stable Release' runs-on: ubuntu-latest steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: Enable Corepack - run: corepack enable - - - name: Install python 3.11 + - name: Install python 3.13 uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.13' - - name: Install Node.js 20 + - name: Install Node.js 22 uses: actions/setup-node@v4 with: - node-version: '20.x' + node-version: 22 + + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Enable Corepack + run: corepack enable pnpm - name: Install PlatformIO run: | python -m pip install --upgrade pip pip install -U platformio - - name: Build WebUI + - name: Build the WebUI run: | cd interface - yarn install - yarn typesafe-i18n --no-watch + pnpm install + pnpm typesafe-i18n --no-watch sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts - yarn build - yarn webUI + pnpm build + pnpm webUI - - name: Build all PIO target environments from default_envs + - name: Build all PIO target environments run: | platformio run env: diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml index 742e82484..95400f40d 100644 --- a/.github/workflows/test_release.yml +++ b/.github/workflows/test_release.yml @@ -8,24 +8,27 @@ on: jobs: pre-release: - name: 'Automatic test-release build' + name: 'Build Test Release' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Enable Corepack - run: corepack enable - - - uses: actions/setup-python@v5 + - name: Install python 3.13 + uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.13' - - name: Use Node.js 20.x + - name: Install Node.js 22 uses: actions/setup-node@v4 with: - node-version: '20.x' + node-version: 22 - - name: Get EMS-ESP source code and version + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Enable Corepack + run: corepack enable pnpm + + - name: Get the EMS-ESP version id: build_info run: | version=`grep -E '^#define EMSESP_APP_VERSION' ./src/emsesp_version.h | awk -F'"' '{print $2}'` @@ -36,16 +39,16 @@ jobs: python -m pip install --upgrade pip pip install -U platformio - - name: Build WebUI + - name: Build the WebUI run: | cd interface - yarn install - yarn typesafe-i18n --no-watch + pnpm install + pnpm typesafe-i18n --no-watch sed -i "s/= 'pl'/= 'en'/" ./src/i18n/i18n-util.ts - yarn build - yarn webUI + pnpm build + pnpm webUI - - name: Build all target environments from default_envs + - name: Build all target environments run: | platformio run env: