From 7676b312a3330eb17870ef098686fb1fbca70db3 Mon Sep 17 00:00:00 2001 From: YeonV Date: Sat, 22 Jun 2024 01:20:15 +0200 Subject: [PATCH] Release 2.0.99 --- .github/workflows/build-deploy.yml | 10 ++++------ .github/workflows/build-hass-addon.yml | 6 ++---- .github/workflows/release.yml | 7 +++---- package.json | 2 +- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index af9694c8..0be28a6b 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -22,13 +22,11 @@ jobs: with: node-version: 20.x - name: Install NPM packages - run: | - yarn global add pnpm - pnpm install + run: yarn install - name: Build project run: | - pnpm buildgh + yarn buildgh sed -i 's/ \-\->/ /g' ./build/index.html - name: Build storybook @@ -36,12 +34,12 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - pnpm build-storybookgh -o ./build/docs + yarn build-storybookgh -o ./build/docs cp ./build/docs/*.woff ./build/docs/static/css cp ./build/docs/*.woff2 ./build/docs/static/css #- name: Run tests - # run: pnpm test + # run: yarn test - name: Upload production-ready build files uses: actions/upload-artifact@v2 diff --git a/.github/workflows/build-hass-addon.yml b/.github/workflows/build-hass-addon.yml index 75bc2689..3c96c429 100644 --- a/.github/workflows/build-hass-addon.yml +++ b/.github/workflows/build-hass-addon.yml @@ -33,14 +33,12 @@ jobs: with: node-version: ${{ matrix.node-version }} - name: Install Node Modules - run: | - yarn add global pnpm - pnpm install + run: yarn - name: Build project Hass env: release_version: ${{ steps.package-version.outputs.current-version}} REACT_APP_VERSION: ${{ steps.package-version.outputs.current-version}} - run: pnpm buildhass + run: yarn buildhass - name: Preparing Archive run: | mv build ledfx_frontend_hass_dev diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b57b7d7a..fac52d61 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,14 +39,13 @@ jobs: node-version: ${{ matrix.node-version }} - name: Install Node Modules run: | - yarn add global pnpm - pnpm install + yarn install - name: Build project env: release_version: ${{ steps.package-version.outputs.current-version}} REACT_APP_VERSION: ${{ steps.package-version.outputs.current-version}} - run: pnpm build + run: yarn build - name: Preparing Archive run: | mv build ledfx_frontend_v2 @@ -113,7 +112,7 @@ jobs: env: release_version: ${{ steps.package-version.outputs.current-version}} REACT_APP_VERSION: ${{ steps.package-version.outputs.current-version}} - run: pnpm buildhass + run: yarn buildhass - name: Preparing Archive run: | mv build ledfx_frontend_hass diff --git a/package.json b/package.json index b95d1e9d..bd74d681 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "postbuildgh": "rm -rf build/app && rm -rf build/preload.js && rm -rf build/renderer.js && rm -rf build/electron.js", "test": "react-scripts test", "eject": "react-scripts eject", - "predeploy": "pnpm buildgh", + "predeploy": "yarn buildgh", "deploy": "gh-pages -d build", "lint": "eslint . --ext .js,.jsx,.ts,.tsx", "packs": "electron-builder --dir",