From 4e98b3b02f1b667b98368dc5b2e016d59e032ee6 Mon Sep 17 00:00:00 2001 From: Han Yeong-woo Date: Fri, 31 May 2024 14:43:11 +0900 Subject: [PATCH 1/3] Bump actions --- .github/actions/setup-environment/action.yml | 8 ++--- .github/workflows/build.yml | 32 ++++++++++---------- .github/workflows/check_version.yml | 4 +-- .github/workflows/labeler.yml | 2 +- .github/workflows/release_latest_dev.yml | 2 +- .github/workflows/test.yml | 12 ++++---- .github/workflows/typos.yml | 6 ++-- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/actions/setup-environment/action.yml b/.github/actions/setup-environment/action.yml index 923fc26f6f..a15e5719d3 100644 --- a/.github/actions/setup-environment/action.yml +++ b/.github/actions/setup-environment/action.yml @@ -12,13 +12,13 @@ runs: echo "cache-version=1" >> $GITHUB_ENV - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: ".node-version" cache: "npm" - name: Cache Electron - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.ELECTRON_CACHE }} key: ${{ env.cache-version }}-${{ runner.os }}--electron-cache-${{ hashFiles('**/package-lock.json') }} @@ -26,7 +26,7 @@ runs: ${{ env.cache-version }}-${{ runner.os }}--electron-cache- - name: Cache Electron-Builder - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.ELECTRON_BUILDER_CACHE }} key: ${{ env.cache-version }}-${{ runner.os }}--electron-builder-cache-${{ hashFiles('**/package-lock.json') }} @@ -34,7 +34,7 @@ runs: ${{ env.cache-version }}-${{ runner.os }}--electron-builder-cache- - name: Cache external dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ./build/vendored key: ${{ env.cache-version }}-${{ runner.os }}--vendored-${{ hashFiles('build/*.js') }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 84ccda8b21..207a98f2b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -124,7 +124,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # NOTE: The default sed of macOS is BSD sed. # There is a difference in specification between BSD sed and GNU sed, @@ -149,13 +149,13 @@ jobs: $sed -i 's/"version": "999.999.999"/"version": "${{ env.VOICEVOX_EDITOR_VERSION }}"/' package.json - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: ".node-version" cache: "npm" - name: Cache Electron - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.ELECTRON_CACHE }} key: ${{ env.cache-version }}-${{ runner.os }}--electron-cache-${{ hashFiles('**/package-lock.json') }} @@ -163,7 +163,7 @@ jobs: ${{ env.cache-version }}-${{ runner.os }}--electron-cache- - name: Cache Electron-Builder - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.ELECTRON_BUILDER_CACHE }} key: ${{ env.cache-version }}-${{ runner.os }}--electron-builder-cache-${{ hashFiles('**/package-lock.json') }} @@ -174,7 +174,7 @@ jobs: run: npm ci - name: Checkout Product Version Resource - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: VOICEVOX/voicevox_resource ref: ${{ env.VOICEVOX_RESOURCE_VERSION }} @@ -300,7 +300,7 @@ jobs: chmod +x "prepackage/VOICEVOX.app/Contents/Frameworks/VOICEVOX Helper (Renderer).app/Contents/MacOS/VOICEVOX Helper (Renderer)" chmod +x "prepackage/VOICEVOX.app/Contents/Frameworks/VOICEVOX Helper.app/Contents/MacOS/VOICEVOX Helper" - # NOTE: actions/upload-artifact@v3 does not upload `**.lproj` directories, which are an empty directory. + # NOTE: actions/upload-artifact@v4 does not upload `**.lproj` directories, which are an empty directory. # Make `ja.lproj` directory because it is necessary for Japanese localization on macOS. - name: Make .lproj directories in Resources directory of VOICEVOX.app if: startsWith(matrix.artifact_name, 'macos-') @@ -317,7 +317,7 @@ jobs: - name: Upload Linux tar.gz (without nvidia) to Artifacts if: startsWith(matrix.artifact_name, 'linux-') && !contains(matrix.artifact_name, 'nvidia') && github.event.inputs.upload_artifact == 'true' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.artifact_name }}-targz path: |- @@ -325,7 +325,7 @@ jobs: - name: Upload Linux tar.gz (without nvidia) to Release Assets if: startsWith(matrix.artifact_name, 'linux-') && !contains(matrix.artifact_name, 'nvidia') && (github.event.release.tag_name || github.event.inputs.version) != '' - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: prerelease: ${{ github.event.inputs.prerelease }} tag_name: ${{ env.VOICEVOX_EDITOR_VERSION }} @@ -347,7 +347,7 @@ jobs: - name: Upload Windows & Mac zip (without nvidia) to Artifacts if: (startsWith(matrix.artifact_name, 'windows-') || startsWith(matrix.artifact_name, 'macos-')) && !contains(matrix.artifact_name, 'nvidia') && github.event.inputs.upload_artifact == 'true' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.artifact_name }}-zip path: |- @@ -355,7 +355,7 @@ jobs: - name: Upload Windows & Mac zip (without nvidia) to Release Assets if: (startsWith(matrix.artifact_name, 'windows-') || startsWith(matrix.artifact_name, 'macos-')) && !contains(matrix.artifact_name, 'nvidia') && (github.event.release.tag_name || github.event.inputs.version) != '' - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: prerelease: ${{ github.event.inputs.prerelease }} tag_name: ${{ env.VOICEVOX_EDITOR_VERSION }} @@ -436,7 +436,7 @@ jobs: - name: Upload Linux AppImage split to Artifacts if: endsWith(matrix.installer_artifact_name, '-appimage') && github.event.inputs.upload_artifact == 'true' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.installer_artifact_name }}-release path: |- @@ -444,7 +444,7 @@ jobs: - name: Upload Linux AppImage split to Release Assets if: endsWith(matrix.installer_artifact_name, '-appimage') && (github.event.release.tag_name || github.event.inputs.version) != '' - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: prerelease: ${{ github.event.inputs.prerelease }} tag_name: ${{ env.VOICEVOX_EDITOR_VERSION }} @@ -454,7 +454,7 @@ jobs: - name: Upload macOS dmg to Artifacts if: endsWith(matrix.installer_artifact_name, '-dmg') && github.event.inputs.upload_artifact == 'true' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.installer_artifact_name }}-release path: |- @@ -462,7 +462,7 @@ jobs: - name: Upload macOS dmg to Release Assets if: endsWith(matrix.installer_artifact_name, '-dmg') && (github.event.release.tag_name || github.event.inputs.version) != '' - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: prerelease: ${{ github.event.inputs.prerelease }} tag_name: ${{ env.VOICEVOX_EDITOR_VERSION }} @@ -472,7 +472,7 @@ jobs: - name: Upload Windows NSIS Web to Artifacts if: endsWith(matrix.installer_artifact_name, '-nsis-web') && github.event.inputs.upload_artifact == 'true' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.installer_artifact_name }}-release path: |- @@ -481,7 +481,7 @@ jobs: - name: Upload Windows NSIS Web to Release Assets if: endsWith(matrix.installer_artifact_name, '-nsis-web') && (github.event.release.tag_name || github.event.inputs.version) != '' - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: prerelease: ${{ github.event.inputs.prerelease }} tag_name: ${{ env.VOICEVOX_EDITOR_VERSION }} diff --git a/.github/workflows/check_version.yml b/.github/workflows/check_version.yml index 75261619f0..6d0a4737da 100644 --- a/.github/workflows/check_version.yml +++ b/.github/workflows/check_version.yml @@ -10,12 +10,12 @@ on: defaults: run: shell: bash - + jobs: check_node_version: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Check synchronize volta and .node_version uses: My-MC/check-sync-volta-and-node-version@v0.0.3 diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 5ec62249f5..43bad20938 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -12,7 +12,7 @@ jobs: triage: runs-on: ubuntu-latest steps: - - uses: github/issue-labeler@v2.0 + - uses: github/issue-labeler@v3.4 with: repo-token: "${{ secrets.GITHUB_TOKEN }}" configuration-path: .github/labeler.yml diff --git a/.github/workflows/release_latest_dev.yml b/.github/workflows/release_latest_dev.yml index 5c86fe9fe9..e73a1a588d 100644 --- a/.github/workflows/release_latest_dev.yml +++ b/.github/workflows/release_latest_dev.yml @@ -17,7 +17,7 @@ jobs: if: github.repository_owner == 'VOICEVOX' steps: - name: Trigger workflow_dispatch - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: github-token: ${{ secrets.GITHUB_TOKEN }} script: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a0f1d8d9ae..b990e5d683 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,7 +43,7 @@ jobs: build-test: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup environment uses: ./.github/actions/setup-environment - run: npm run electron:build @@ -52,7 +52,7 @@ jobs: unit-test: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup environment uses: ./.github/actions/setup-environment @@ -74,7 +74,7 @@ jobs: - os: windows-latest voicevox_engine_asset_name: windows-cpu steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup environment uses: ./.github/actions/setup-environment @@ -135,7 +135,7 @@ jobs: - name: Upload playwright report to artifact if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: playwright-report-${{ matrix.os }} path: playwright-report @@ -161,7 +161,7 @@ jobs: needs: [config, e2e-test] if: needs.config.outputs.shouldUpdateSnapshots == 'true' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Download artifacts uses: actions/download-artifact@v4 @@ -192,7 +192,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup environment uses: ./.github/actions/setup-environment diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml index f00617a22a..ea745552b4 100644 --- a/.github/workflows/typos.yml +++ b/.github/workflows/typos.yml @@ -10,15 +10,15 @@ on: defaults: run: shell: bash - + jobs: typos: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: typos-action - uses: crate-ci/typos@v1.12.12 + uses: crate-ci/typos@v1.21.0 with: files: ". .github" From 40362e271b5292c2e689093146899321ebeccf66 Mon Sep 17 00:00:00 2001 From: Han Yeong-woo Date: Fri, 31 May 2024 15:11:34 +0900 Subject: [PATCH 2/3] =?UTF-8?q?"crate-ci/typos=20action"=E3=81=AE=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _typos.toml | 8 +++++++- docker-compose.yml | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/_typos.toml b/_typos.toml index 42cd7949ad..f38f2599ce 100644 --- a/_typos.toml +++ b/_typos.toml @@ -2,10 +2,16 @@ # Instruction: https://github.com/marketplace/actions/typos-action#getting-started [default.extend-identifiers] +splited = "splited" # コードで使う時、もっと自然な感じを与える [default.extend-words] ba = "ba" # 7zコマンドの-baオプション commitish = "commitish" # softprops/action-gh-releaseのオプションの１つ [files] -extend-exclude = ["package-lock.json", "src/domain/project/index.ts", "*.svg"] +extend-exclude = [ + "package-lock.json", + "src/domain/project/index.ts", + "*.svg", + "public/res/macos-big-sur-software-update-rosetta-alert.jpg", # macos-big-surは正しい固有名詞 +] diff --git a/docker-compose.yml b/docker-compose.yml index c7215ca192..77117ea2bd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,9 @@ version: '3' services: test: - build: . + build: . working_dir: /work - # If you don't have node_modules, use "npm ci", install node_modules into the yor directory. + # If you don't have node_modules, use "npm ci", install node_modules into the your directory. # Use command bellow # `docker-compose up -d --build` # The container will stop automatically after install @@ -12,7 +12,7 @@ services: # command: "npm ci" - # After node_modules install, use command bellow to exec "/bin/sh" and the container will remain. + # After node_modules install, use command bellow to exec "/bin/sh" and the container will remain. # `docker-compose up -d` # To access container, use command bellow # `docker exec -it voicevox_test_1 /bin/bash` @@ -21,7 +21,7 @@ services: # If you want test automatically (test runs when you save any files), use this command property and view logs - # Use Command bellow + # Use Command bellow # `docker logs --tail 1000 -f voicevox_test_1` command: "npm run test-watch:unit " From e313d53e6a9be2c73626069d231b17fcdea8b4a5 Mon Sep 17 00:00:00 2001 From: Hiroshiba Date: Sun, 2 Jun 2024 11:29:51 +0900 Subject: [PATCH 3/3] Apply suggestions from code review --- _typos.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_typos.toml b/_typos.toml index f38f2599ce..ce09d78b7c 100644 --- a/_typos.toml +++ b/_typos.toml @@ -10,8 +10,8 @@ commitish = "commitish" # softprops/action-gh-releaseのオプションの１つ [files] extend-exclude = [ - "package-lock.json", - "src/domain/project/index.ts", - "*.svg", - "public/res/macos-big-sur-software-update-rosetta-alert.jpg", # macos-big-surは正しい固有名詞 + "package-lock.json", + "src/domain/project/index.ts", + "*.svg", + "public/res/macos-big-sur-software-update-rosetta-alert.jpg", # macos-big-surは正しい固有名詞 ]