diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 7f7cc6a..5735db8 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -17,12 +17,12 @@ jobs: - ubuntu - macos node: - - 16 + - 22 steps: - name: 'Checkout' uses: actions/checkout@v4.1.7 - - name: 'Setup Node.js environment' + - name: 'Setup Node.js "${{ matrix.node }}.x" environment' uses: actions/setup-node@v4 with: node-version: ${{ matrix.node }} @@ -31,7 +31,7 @@ jobs: - name: 'Setup pnpm' uses: pnpm/action-setup@v4 - - name: 'Setup Python environment (Mac) Because of electron-builder install-app-deps requires Python setuptools' + - name: 'Setup Python environment (Mac) Because of electron-builder install-app-deps requires Python setup tools' if: matrix.os == 'macos' uses: actions/setup-python@v5 with: diff --git a/.github/workflows/test-and-upload.yml b/.github/workflows/test-and-upload.yml index 32459f3..932a795 100644 --- a/.github/workflows/test-and-upload.yml +++ b/.github/workflows/test-and-upload.yml @@ -27,7 +27,7 @@ jobs: - name: 'Checkout' uses: actions/checkout@v4.1.7 - - name: 'Setup Node.js environment' + - name: 'Setup Node.js "${{ matrix.node }}.x" environment' uses: actions/setup-node@v4 with: node-version: ${{ matrix.node }} @@ -36,13 +36,12 @@ jobs: - name: 'Setup pnpm' uses: pnpm/action-setup@v4 - - name: 'Setup Python environment (Mac) Because of electron-builder install-app-deps requires Python setuptools' + - name: 'Setup Python environment (Mac) Because of electron-builder install-app-deps requires Python setup tools' if: matrix.os == 'macos' uses: actions/setup-python@v5 with: python-version: '3.10' - - name: 'Get package info' id: package-info uses: luizfelipelaviola/get-package-info@v1 diff --git a/_script/1、installEnv.bat b/_script/1、installEnv.bat deleted file mode 100644 index d395bf8..0000000 --- a/_script/1、installEnv.bat +++ /dev/null @@ -1,7 +0,0 @@ -cd ../ - -node -v - -npm install -g cnpm --registry=https://registry.npmmirror.com - -cnpm install -g lerna@6 diff --git a/_script/1、setupEnv.bat b/_script/1、setupEnv.bat new file mode 100644 index 0000000..59c2ba2 --- /dev/null +++ b/_script/1、setupEnv.bat @@ -0,0 +1,5 @@ +cd ../ + +node -v + +npm install -g pnpm --registry=https://registry.npmmirror.com diff --git a/_script/2、installBootstrap.bat b/_script/2、installProject.bat similarity index 51% rename from _script/2、installBootstrap.bat rename to _script/2、installProject.bat index 73d4d58..976629a 100644 --- a/_script/2、installBootstrap.bat +++ b/_script/2、installProject.bat @@ -2,4 +2,4 @@ cd ../ node -v -lerna bootstrap +pnpm install