diff --git a/.github/workflows/build-app.yaml b/.github/workflows/build-app.yaml index 7a8ade4..ad84085 100644 --- a/.github/workflows/build-app.yaml +++ b/.github/workflows/build-app.yaml @@ -3,61 +3,61 @@ on: workflow_dispatch: jobs: - # build-for-macos: - # name: macOS - # permissions: - # contents: write - # strategy: - # fail-fast: false - # matrix: - # include: - # - target: universal-apple-darwin - # build: macos - # os: macos-latest - # arch: universal - # - target: aarch64-apple-darwin - # build: macos - # os: macos-latest - # arch: aarch64 - # - target: x86_64-apple-darwin - # build: macos - # os: macos-latest - # arch: x86_64 + build-for-macos: + name: macOS + permissions: + contents: write + strategy: + fail-fast: false + matrix: + include: + - target: universal-apple-darwin + build: macos + os: macos-latest + arch: universal + - target: aarch64-apple-darwin + build: macos + os: macos-latest + arch: aarch64 + - target: x86_64-apple-darwin + build: macos + os: macos-latest + arch: x86_64 - # runs-on: ${{ matrix.os }} - # steps: - # - uses: actions/checkout@v4 - # - name: Setup PNPM - # uses: pnpm/action-setup@v3 - # with: - # version: 8.5.1 - # - name: Setup Node.js - # uses: actions/setup-node@v4 - # with: - # node-version: 20 - # cache: "pnpm" - # cache-dependency-path: "pnpm-lock.yaml" - # - name: Setup Rust - # uses: dtolnay/rust-toolchain@stable - # with: - # toolchain: stable - # targets: ${{ matrix.arch == 'universal' && 'aarch64-apple-darwin,x86_64-apple-darwin' || matrix.target }} - # - name: Setup Rust Cache - # uses: swatinem/rust-cache@v2 - # with: - # workspaces: './src-tauri -> target' - # - name: Build APP - # run: | - # pnpm install - # VERSION=$(node -p "require('./package.json').version") - # CI=false pnpm tauri build -c "{\"version\":\"$VERSION\"}" -t ${{ matrix.target }} - # APP_NAME="MagicMirror_${VERSION}_${{ matrix.build }}_${{ matrix.arch }}" - # node scripts/dist.js ${{ matrix.target }} $APP_NAME - # - name: Upload App - # uses: actions/upload-artifact@v4 - # with: - # name: app_${{ matrix.build }}_${{ matrix.arch }} - # path: dist/MagicMirror_* + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + - name: Setup PNPM + uses: pnpm/action-setup@v3 + with: + version: 8.5.1 + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + cache: "pnpm" + cache-dependency-path: "pnpm-lock.yaml" + - name: Setup Rust + uses: dtolnay/rust-toolchain@stable + with: + toolchain: stable + targets: ${{ matrix.arch == 'universal' && 'aarch64-apple-darwin,x86_64-apple-darwin' || matrix.target }} + - name: Setup Rust Cache + uses: swatinem/rust-cache@v2 + with: + workspaces: './src-tauri -> target' + - name: Build APP + run: | + pnpm install + VERSION=$(node -p "require('./package.json').version") + CI=false pnpm tauri build -c "{\"version\":\"$VERSION\"}" -t ${{ matrix.target }} + APP_NAME="MagicMirror_${VERSION}_${{ matrix.build }}_${{ matrix.arch }}" + node scripts/dist.js ${{ matrix.target }} $APP_NAME + - name: Upload App + uses: actions/upload-artifact@v4 + with: + name: app_${{ matrix.build }}_${{ matrix.arch }} + path: dist/MagicMirror_* build-for-windows: name: Windows @@ -112,38 +112,38 @@ jobs: name: app_${{ matrix.build }}_${{ matrix.arch }} path: dist/MagicMirror_* - # release: - # name: Release - # needs: [build-for-macos, build-for-windows] - # runs-on: ubuntu-latest + release: + name: Release + needs: [build-for-macos, build-for-windows] + runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v4 - # - name: Download Artifacts - # uses: actions/download-artifact@v4 - # with: - # pattern: app_* - # path: dist - # merge-multiple: true - # - name: Setup Node.js - # uses: actions/setup-node@v4 - # with: - # node-version: 20 - # - name: Check Version - # id: version - # run: | - # VERSION=$(node -p "require('./package.json').version") - # echo "version=$VERSION" >> $GITHUB_OUTPUT - # - name: Release MagicMirror v${{ steps.version.outputs.version }} - # uses: ncipollo/release-action@v1 - # with: - # allowUpdates: true - # token: ${{ secrets.GITHUB_TOKEN }} - # tag: app-v${{ steps.version.outputs.version }} - # name: MagicMirror v${{ steps.version.outputs.version }} - # body: MagicMirror APP v${{ steps.version.outputs.version }} - # draft: true - # prerelease: false - # makeLatest: latest - # removeArtifacts: true - # artifacts: dist/* + steps: + - uses: actions/checkout@v4 + - name: Download Artifacts + uses: actions/download-artifact@v4 + with: + pattern: app_* + path: dist + merge-multiple: true + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + - name: Check Version + id: version + run: | + VERSION=$(node -p "require('./package.json').version") + echo "version=$VERSION" >> $GITHUB_OUTPUT + - name: Release MagicMirror v${{ steps.version.outputs.version }} + uses: ncipollo/release-action@v1 + with: + allowUpdates: true + token: ${{ secrets.GITHUB_TOKEN }} + tag: app-v${{ steps.version.outputs.version }} + name: MagicMirror v${{ steps.version.outputs.version }} + body: MagicMirror APP v${{ steps.version.outputs.version }} + draft: true + prerelease: false + makeLatest: latest + removeArtifacts: true + artifacts: dist/* diff --git a/README.md b/README.md index 72dc446..285891b 100644 --- a/README.md +++ b/README.md @@ -16,12 +16,12 @@ Instant AI Face Swap, Hairstyles & Outfits — One click to a brand new you! ## Installation -> [👉 中文教程请戳这里](./README.zh-CN.md) +> [👉 中文教程和下载地址请戳这里](./README.zh-CN.md) MagicMirror currently supports macOS and Windows: 1. [Download](https://github.com/idootop/MagicMirror/releases/tag/app-v1.0.0) -2. [Usage Guide](https://thread-sphynx-f26.notion.site/MagicMirror-User-Guide-147aea89ebf680c189cdd76f5668261a) +2. [Installation Guide](https://thread-sphynx-f26.notion.site/MagicMirror-User-Guide-147aea89ebf680c189cdd76f5668261a) If you have any questions or need assistance, please [submit an issue](https://github.com/idootop/MagicMirror/issues) or join our [Discord server](https://discord.gg/87RuMC5smy). diff --git a/README.zh-CN.md b/README.zh-CN.md index 3737a28..4e9a06f 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -18,7 +18,7 @@ MagicMirror 目前支持 macOS 和 Windows 系统: 1. [下载安装包](https://github.com/idootop/MagicMirror/releases/tag/app-v1.0.0) -2. [使用教程](https://ccnpyvkdfkte.feishu.cn/wiki/LAn6w4NqwiqeKmkXBrLc4MEBnDh) +2. [安装/使用教程](https://ccnpyvkdfkte.feishu.cn/wiki/LAn6w4NqwiqeKmkXBrLc4MEBnDh) 如果你还有其他问题,请提交 [Issue](https://github.com/idootop/MagicMirror/issues) 或加入 [QQ 交流群](https://pd.qq.com/s/btxvzr9de)。