Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into pr/sigprogramming/2056
Browse files Browse the repository at this point in the history
  • Loading branch information
Hiroshiba committed May 13, 2024
2 parents 121463c + 1087cad commit 21e7cc4
Show file tree
Hide file tree
Showing 37 changed files with 6,430 additions and 17,742 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @VOICEVOX/maintainer
* @VOICEVOX/main-reviewer
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
app_asar_dir: prepackage/VOICEVOX.app/Contents/Resources
installer_artifact_name: macos-cpu-dmg
macos_artifact_name: "VOICEVOX.${version}.${ext}"
os: macos-11
os: macos-12

runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -236,7 +236,7 @@ jobs:

# https://github.com/electron-userland/electron-builder/issues/3179
USE_HARD_LINKS: false
run: npm run electron:build_dir
run: npm run electron:build -- --dir

- name: Reset Code Signing Envs
if: startsWith(matrix.os, 'windows-') && github.event.inputs.code_signing == 'true'
Expand Down Expand Up @@ -394,14 +394,14 @@ jobs:
LINUX_ARTIFACT_NAME: ${{ matrix.linux_artifact_name }}
LINUX_EXECUTABLE_NAME: ${{ matrix.linux_executable_name }}
run: |
PREPACKAGED="prepackage" npm run electron:build_pnever_prepackaged
npm run electron:build -- --prepackaged prepackage/
- name: Build Electron (for macOS)
if: endsWith(matrix.installer_artifact_name, '-dmg') # macOS
env:
MACOS_ARTIFACT_NAME: ${{ matrix.macos_artifact_name }}
run: |
PREPACKAGED="prepackage/VOICEVOX.app" npm run electron:build_pnever_prepackaged
npm run electron:build -- --prepackaged prepackage/VOICEVOX.app
- name: Reset Code Signing Envs
if: startsWith(matrix.os, 'windows-') && github.event.inputs.code_signing == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- uses: actions/checkout@v3
- name: Setup environment
uses: ./.github/actions/setup-environment
- run: npm run electron:build_pnever
- run: npm run electron:build

# unit テスト
unit-test:
Expand Down
3 changes: 0 additions & 3 deletions babel.config.js

This file was deleted.

2 changes: 0 additions & 2 deletions build/download7z.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ const fs = require("fs");
const { spawnSync } = require("child_process");

(async () => {
// node-fetchはESModuleなので、import()で読み込む
const { default: fetch } = await import("node-fetch");
const distPath = path.resolve(__dirname, "vendored", "7z");
let url;
let filesToExtract;
Expand Down
Loading

0 comments on commit 21e7cc4

Please sign in to comment.