* fix(plugin-fuses): use the latest version for the plugin and its dependencies

* fix: updated versions in the test app

* fix: rename the test fixture folder

* bump

* fix: use new fixture folder name in the test

* attempt npm install

* keep debugging

* i dont know windows

* zzz

* bump

* freeze lockfile

* update lockfile

* downgrade npm 8

* switch shell back to bash

* try again

---------

Co-authored-by: Erik Moura <erikian@erikian.dev>
This commit is contained in:
Erick Zhao 2023-02-22 13:17:35 -08:00 коммит произвёл GitHub
Родитель 133ad6350e
Коммит 8f485cc0ac
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
7 изменённых файлов: 21 добавлений и 14 удалений

10
.github/workflows/ci.yml поставляемый
Просмотреть файл

@ -23,13 +23,10 @@ jobs:
with:
node-version: 14.x
cache: yarn
- name: Install latest NPM on Windows
- name: Install npm 8 on Windows
if: matrix.os == 'windows-latest'
# See https://github.com/actions/virtual-environments/issues/4856#issuecomment-1043256330
# and https://github.com/actions/setup-node/issues/411#issuecomment-1051084491
run: |
npm install -g npm@8.3.1
npm install -g npm@latest
npm install -g npm@8
- name: Install
run: yarn install
- name: Lint
@ -54,6 +51,7 @@ jobs:
if: matrix.os == 'windows-latest'
shell: bash
run: |
npm install -g npm@8
echo 'C:\Program Files (x86)\WiX Toolset v3.11\bin' >> $GITHUB_PATH
npm config set node-gyp "$GITHUB_WORKSPACE\node_modules\node-gyp\bin\node-gyp.js"
- name: Linux specific setup
@ -72,7 +70,7 @@ jobs:
node-version: 14.x
cache: yarn
- name: Install
run: yarn install
run: yarn install --frozen-lockfile
- name: Build
run: yarn build
- name: Test

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "@electron-forge/plugin-fuses",
"version": "6.0.4",
"version": "6.0.5",
"description": "A plugin for flipping Electron Fuses in Electron Forge",
"repository": "https://github.com/electron/forge",
"author": "Erik Moura <erikian@erikian.dev>",
@ -30,8 +30,8 @@
"node": ">= 14.17.5"
},
"dependencies": {
"@electron-forge/plugin-base": "6.0.4",
"@electron-forge/shared-types": "6.0.4"
"@electron-forge/plugin-base": "6.0.5",
"@electron-forge/shared-types": "6.0.5"
},
"publishConfig": {
"access": "public"

Просмотреть файл

@ -8,7 +8,7 @@ import fsExtra from 'fs-extra';
import { getElectronExecutablePath } from '../src/util/getElectronExecutablePath';
describe('FusesPlugin', () => {
const appPath = path.join(__dirname, 'fixtures', 'app');
const appPath = path.join(__dirname, 'fixture', 'app');
const spawnOptions: CrossSpawnOptions = {
cwd: appPath,
@ -37,7 +37,7 @@ describe('FusesPlugin', () => {
await fsExtra.remove(path.resolve(outDir, '../'));
// @TODO this can be removed once the mock app installs a published version of @electron-forge/plugin-fuses instead of a local package
await fsExtra.remove(path.join(__dirname, './fixtures/app/node_modules'));
await fsExtra.remove(path.join(__dirname, './fixture/app/node_modules'));
});
it('should flip Fuses', async () => {

Просмотреть файл

@ -6,13 +6,13 @@
"package": "electron-forge package"
},
"dependencies": {
"@electron-forge/plugin-fuses": "file:./../../../../fuses",
"@electron-forge/shared-types": "6.0.4",
"@electron/fuses": "^1.6.1",
"fs-extra": "^10.0.0"
},
"devDependencies": {
"@electron-forge/cli": "6.0.4",
"@electron-forge/cli": "6.0.5",
"@electron-forge/plugin-fuses": "file:./../../../../fuses",
"@electron-forge/shared-types": "6.0.5",
"electron": "12.0.0"
}
}

Просмотреть файл

@ -1137,6 +1137,15 @@
optionalDependencies:
"@types/glob" "^7.1.1"
"@electron/fuses@>=1.0.0":
version "1.6.1"
resolved "https://registry.yarnpkg.com/@electron/fuses/-/fuses-1.6.1.tgz#c639e018202a59e3cd8911fa943e22c63dd3e6fc"
integrity sha512-J7kRMlc0vP03uzUuhHNEqffqZMZ6FRe0YGMOJO4kJObmYkOg38mMTvbbktEj+oteH5nfyhbQUkHIYnMSh7T/CQ==
dependencies:
chalk "^4.1.1"
fs-extra "^9.0.1"
minimist "^1.2.5"
"@electron/get@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.0.tgz#d991e68dc089fc66b521ec3ca4021515482bef91"