From ea8cf1da1b9588d73c9771239d1fc0f9f1fe0cbf Mon Sep 17 00:00:00 2001 From: usuyuki <63891531+usuyuki@users.noreply.github.com> Date: Thu, 30 Nov 2023 17:18:20 +0900 Subject: [PATCH 1/7] =?UTF-8?q?feat=20github=20action=E3=81=A7release?= =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 58 +++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..fedd292 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,58 @@ +# https://github.com/tauri-apps/tauri-action/blob/dev/examples/publish-to-manual-release.yml +name: Release +on: + push: + tags: + - 'v*' + workflow_dispatch: + +jobs: + release: + permissions: + contents: write + strategy: + fail-fast: false + matrix: + platform: [macos-latest, ubuntu-20.04, windows-latest] + runs-on: ${{ matrix.platform }} + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Install dependencies (ubuntu only) + if: matrix.platform == 'ubuntu-20.04' + # You can remove libayatana-appindicator3-dev if you don't use the system tray feature. + run: | + sudo apt-get update + sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev + + - name: Rust setup + uses: dtolnay/rust-toolchain@stable + + - name: Rust cache + uses: swatinem/rust-cache@v2 + with: + workspaces: './src-tauri -> target' + + - name: Sync node version and setup cache + uses: actions/setup-node@v4 + with: + node-version: 20 + cache: 'pnpm' + + - name: Install frontend dependencies + # If you don't have `beforeBuildCommand` configured you may want to build your frontend here too. + run: pnpm install + + - name: Build the app + uses: tauri-apps/tauri-action@v0 + + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tagName: ${{ github.ref_name }} # This only works if your workflow triggers on new tags. + releaseName: 'App Name v__VERSION__' # tauri-action replaces \_\_VERSION\_\_ with the app version. + releaseBody: 'See the assets to download and install this version.' + releaseDraft: true + prerelease: false From 8ccaf72863ca212f7a3fb30114482eae76373b14 Mon Sep 17 00:00:00 2001 From: usuyuki <63891531+usuyuki@users.noreply.github.com> Date: Thu, 30 Nov 2023 17:18:28 +0900 Subject: [PATCH 2/7] =?UTF-8?q?test=20=E5=8B=95=E4=BD=9C=E6=A4=9C=E8=A8=BC?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fedd292..5d966d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,10 +1,6 @@ # https://github.com/tauri-apps/tauri-action/blob/dev/examples/publish-to-manual-release.yml name: Release -on: - push: - tags: - - 'v*' - workflow_dispatch: +on: pull_request jobs: release: From 09a85ea9209a7c7d0da186992b463ae66b58ae60 Mon Sep 17 00:00:00 2001 From: usuyuki <63891531+usuyuki@users.noreply.github.com> Date: Thu, 30 Nov 2023 17:26:01 +0900 Subject: [PATCH 3/7] =?UTF-8?q?fix=20pnpm=20install=E5=85=A5=E3=82=8C?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5d966d3..bb39764 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,6 +37,13 @@ jobs: node-version: 20 cache: 'pnpm' + - uses: pnpm/action-setup@v2 + name: Install pnpm + id: pnpm-install + with: + version: 8 + run_install: false + - name: Install frontend dependencies # If you don't have `beforeBuildCommand` configured you may want to build your frontend here too. run: pnpm install From 49ae086f3295f90538d8e01b2da5402873fd5d38 Mon Sep 17 00:00:00 2001 From: usuyuki <63891531+usuyuki@users.noreply.github.com> Date: Thu, 30 Nov 2023 17:28:08 +0900 Subject: [PATCH 4/7] =?UTF-8?q?fix=20node=E3=82=88=E3=82=8A=E5=85=88?= =?UTF-8?q?=E3=81=ABpnpm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bb39764..5b89b40 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,12 +31,6 @@ jobs: with: workspaces: './src-tauri -> target' - - name: Sync node version and setup cache - uses: actions/setup-node@v4 - with: - node-version: 20 - cache: 'pnpm' - - uses: pnpm/action-setup@v2 name: Install pnpm id: pnpm-install @@ -44,6 +38,12 @@ jobs: version: 8 run_install: false + - name: Sync node version and setup cache + uses: actions/setup-node@v4 + with: + node-version: 20 + cache: 'pnpm' + - name: Install frontend dependencies # If you don't have `beforeBuildCommand` configured you may want to build your frontend here too. run: pnpm install From 845edc87e30673e51aec668d3a95d8bc62094b54 Mon Sep 17 00:00:00 2001 From: usuyuki <63891531+usuyuki@users.noreply.github.com> Date: Thu, 30 Nov 2023 17:31:44 +0900 Subject: [PATCH 5/7] =?UTF-8?q?refacotr=20pnpm=E3=81=AEcache=E3=82=92?= =?UTF-8?q?=E8=87=AA=E5=89=8D=E3=81=A7=E3=81=AA=E3=81=8Fnode=E3=81=AEactio?= =?UTF-8?q?n=E3=81=A7=E3=82=84=E3=81=A3=E3=81=A6=E3=82=82=E3=82=89?= =?UTF-8?q?=E3=81=86=E3=82=88=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/lint.yml | 23 +++++------------------ .github/workflows/staticAnalysis.yml | 23 +++++------------------ 2 files changed, 10 insertions(+), 36 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8a0a354..415129d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,12 +11,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 - - - name: Install Node.js - uses: actions/setup-node@v3 - with: - node-version: 20 + uses: actions/checkout@v4 - uses: pnpm/action-setup@v2 name: Install pnpm @@ -25,19 +20,11 @@ jobs: version: 8 run_install: false - - name: Get pnpm store directory - id: pnpm-cache - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT - - - uses: actions/cache@v3 - name: Setup pnpm cache + - name: Install Node.js + uses: actions/setup-node@v4 with: - path: ${{ steps.pnpm-cache.outputs.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- + node-version: 20 + cache: 'pnpm' - name: Install dependencies run: pnpm install diff --git a/.github/workflows/staticAnalysis.yml b/.github/workflows/staticAnalysis.yml index f15e3a6..78220c0 100644 --- a/.github/workflows/staticAnalysis.yml +++ b/.github/workflows/staticAnalysis.yml @@ -11,12 +11,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 - - - name: Install Node.js - uses: actions/setup-node@v3 - with: - node-version: 20 + uses: actions/checkout@v4 - uses: pnpm/action-setup@v2 name: Install pnpm @@ -25,19 +20,11 @@ jobs: version: 8 run_install: false - - name: Get pnpm store directory - id: pnpm-cache - shell: bash - run: | - echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT - - - uses: actions/cache@v3 - name: Setup pnpm cache + - name: Install Node.js + uses: actions/setup-node@v4 with: - path: ${{ steps.pnpm-cache.outputs.STORE_PATH }} - key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-pnpm-store- + node-version: 20 + cache: 'pnpm' - name: Install dependencies run: pnpm install From e8e86cd96e9d609ad73f25f074d492eb60f9c540 Mon Sep 17 00:00:00 2001 From: usuyuki <63891531+usuyuki@users.noreply.github.com> Date: Thu, 30 Nov 2023 17:39:52 +0900 Subject: [PATCH 6/7] =?UTF-8?q?fix=20tag=E5=88=87=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=81=A8=E3=81=8D=E3=81=A0=E3=81=91=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5b89b40..e4840a1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,10 @@ # https://github.com/tauri-apps/tauri-action/blob/dev/examples/publish-to-manual-release.yml name: Release -on: pull_request +on: + push: + tags: + - 'v*' + workflow_dispatch: jobs: release: From 1a4d86103fe5acae18d2840da9c38f92af700852 Mon Sep 17 00:00:00 2001 From: usuyuki <63891531+usuyuki@users.noreply.github.com> Date: Thu, 30 Nov 2023 17:42:29 +0900 Subject: [PATCH 7/7] =?UTF-8?q?feat=20=E3=82=B9=E3=83=86=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=82=B9=E3=83=90=E3=83=83=E3=82=B8=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 8d9dfee..25ac03c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ +# Mahiwa + +[![Release](https://github.com/project-mahiwa/mahiwa/actions/workflows/release.yml/badge.svg)](https://github.com/project-mahiwa/mahiwa/actions/workflows/release.yml) +[![Lint](https://github.com/project-mahiwa/mahiwa/actions/workflows/lint.yml/badge.svg)](https://github.com/project-mahiwa/mahiwa/actions/workflows/lint.yml) +[![静的解析 (svelte-check)](https://github.com/project-mahiwa/mahiwa/actions/workflows/staticAnalysis.yml/badge.svg)](https://github.com/project-mahiwa/mahiwa/actions/workflows/staticAnalysis.yml) + ## Install https://tauri.app/v1/guides/getting-started/prerequisites