diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index ab550ffef7..a874eef652 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -87,7 +87,7 @@ jobs: restore-keys: | ${{ runner.os }}-electron-builder-cache- - - name: "'pnpm install --force' Because we need to install optional dependencies" + - name: "'pnpm install' Because we need to install optional dependencies" run: | echo "======================================================================"; dir || ls -lah; @@ -144,10 +144,15 @@ jobs: cd packages/gui/dist_electron; mv DevSidecar-${{ steps.package-info.outputs.version }}-amd64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb; mv DevSidecar-${{ steps.package-info.outputs.version }}-x86_64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage; + mv DevSidecar-${{ steps.package-info.outputs.version }}-x64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz; + #------------------------------------------------------------------------------------------------------------------------- mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb; mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage; + mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz; + #------------------------------------------------------------------------------------------------------------------------- mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb; mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage; + mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz; ls -lah; - name: 'Rename artifacts - macOS' if: ${{ matrix.os == 'macos' }} @@ -204,6 +209,14 @@ jobs: path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage' if-no-files-found: error + - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz' + uses: actions/upload-artifact@v4.4.0 + if: ${{ matrix.os == 'ubuntu' }} + with: + path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz + name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz' + if-no-files-found: error + #------------------------------------------------------------------------------------------------------------------------- - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb' uses: actions/upload-artifact@v4.4.0 if: ${{ matrix.os == 'ubuntu' }} @@ -218,6 +231,14 @@ jobs: path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage' if-no-files-found: error + - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz' + uses: actions/upload-artifact@v4.4.0 + if: ${{ matrix.os == 'ubuntu' }} + with: + path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz + name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz' + if-no-files-found: error + #------------------------------------------------------------------------------------------------------------------------- - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb' uses: actions/upload-artifact@v4.4.0 if: ${{ matrix.os == 'ubuntu' }} @@ -232,6 +253,13 @@ jobs: path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage' if-no-files-found: error + - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz' + uses: actions/upload-artifact@v4.4.0 + if: ${{ matrix.os == 'ubuntu' }} + with: + path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz + name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz' + if-no-files-found: error #endregion Upload artifacts - Linux # Upload artifacts - macOS @@ -263,11 +291,6 @@ jobs: runs-on: ubuntu-latest needs: - build-and-upload - strategy: - fail-fast: false - matrix: - preReleaseVersion: - - '' steps: - name: Checkout uses: actions/checkout@v4.1.7 @@ -313,6 +336,12 @@ jobs: with: name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage' path: release + - name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz' + uses: actions/download-artifact@v4.1.8 + with: + name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz' + path: release + #------------------------------------------------------------------------------------------------------------------------- - name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb' uses: actions/download-artifact@v4.1.8 with: @@ -323,6 +352,12 @@ jobs: with: name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage' path: release + - name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz' + uses: actions/download-artifact@v4.1.8 + with: + name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz' + path: release + #------------------------------------------------------------------------------------------------------------------------- - name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb' uses: actions/download-artifact@v4.1.8 with: @@ -333,6 +368,11 @@ jobs: with: name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage' path: release + - name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz' + uses: actions/download-artifact@v4.1.8 + with: + name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz' + path: release - name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg' uses: actions/download-artifact@v4.1.8 diff --git a/.github/workflows/test-and-upload.yml b/.github/workflows/test-and-upload.yml index 0dd17b03e7..a8e2741247 100644 --- a/.github/workflows/test-and-upload.yml +++ b/.github/workflows/test-and-upload.yml @@ -94,7 +94,7 @@ jobs: restore-keys: | ${{ runner.os }}-electron-builder-cache- - - name: "'pnpm install --force' Because we need to install optional dependencies" + - name: "'pnpm install' Because we need to install optional dependencies" run: | echo "======================================================================"; dir || ls -lah; @@ -151,10 +151,15 @@ jobs: cd packages/gui/dist_electron; mv DevSidecar-${{ steps.package-info.outputs.version }}-amd64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb; mv DevSidecar-${{ steps.package-info.outputs.version }}-x86_64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage; + mv DevSidecar-${{ steps.package-info.outputs.version }}-x64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz; + #------------------------------------------------------------------------------------------------------------------------- mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb; mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage; + mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz; + #------------------------------------------------------------------------------------------------------------------------- mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb; mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage; + mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz; ls -lah; - name: 'Rename artifacts - macOS' if: ${{ matrix.os == 'macos' }} @@ -211,6 +216,14 @@ jobs: path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage' if-no-files-found: error + - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz' + uses: actions/upload-artifact@v4.4.0 + if: ${{ matrix.os == 'ubuntu' }} + with: + path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz + name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz' + if-no-files-found: error + #------------------------------------------------------------------------------------------------------------------------- - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb' uses: actions/upload-artifact@v4.4.0 if: ${{ matrix.os == 'ubuntu' }} @@ -225,6 +238,14 @@ jobs: path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage' if-no-files-found: error + - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz' + uses: actions/upload-artifact@v4.4.0 + if: ${{ matrix.os == 'ubuntu' }} + with: + path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz + name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz' + if-no-files-found: error + #------------------------------------------------------------------------------------------------------------------------- - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb' uses: actions/upload-artifact@v4.4.0 if: ${{ matrix.os == 'ubuntu' }} @@ -239,6 +260,13 @@ jobs: path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage' if-no-files-found: error + - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz' + uses: actions/upload-artifact@v4.4.0 + if: ${{ matrix.os == 'ubuntu' }} + with: + path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz + name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz' + if-no-files-found: error #endregion Upload artifacts - Linux # Upload artifacts - macOS diff --git a/packages/cli/package.json b/packages/cli/package.json index 2d7a7cb176..29535a6745 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@docmirror/dev-sidecar-cli", - "version": "2.0.0-RC6", + "version": "2.0.0", "private": false, "description": "给开发者的加速代理工具", "author": "docmirror.cn", diff --git a/packages/core/package.json b/packages/core/package.json index fa9c4d5040..036f69b765 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@docmirror/dev-sidecar", - "version": "2.0.0-RC6", + "version": "2.0.0", "private": false, "description": "给开发者的加速代理工具", "author": "docmirror.cn", diff --git a/packages/gui/package.json b/packages/gui/package.json index 24af9982fc..29dd35becb 100644 --- a/packages/gui/package.json +++ b/packages/gui/package.json @@ -1,6 +1,6 @@ { "name": "@docmirror/dev-sidecar-gui", - "version": "2.0.0-RC6", + "version": "2.0.0", "private": false, "author": { "email": "xiaojunnuo@qq.com", diff --git a/packages/gui/vue.config.js b/packages/gui/vue.config.js index 73bcedd59b..395d1be41c 100644 --- a/packages/gui/vue.config.js +++ b/packages/gui/vue.config.js @@ -103,6 +103,10 @@ module.exports = defineConfig({ target: 'AppImage', arch: ['x64', 'arm64', 'armv7l'], }, + { + target: 'tar.gz', + arch: ['x64', 'arm64', 'armv7l'], + }, ], category: 'System', }, diff --git a/packages/mitmproxy/package.json b/packages/mitmproxy/package.json index 65a9b4cfc4..b2d53a35b2 100644 --- a/packages/mitmproxy/package.json +++ b/packages/mitmproxy/package.json @@ -1,6 +1,6 @@ { "name": "@docmirror/mitmproxy", - "version": "2.0.0-RC6", + "version": "2.0.0", "private": false, "description": "", "author": "docmirror.cn",