Don't resign SEA binary

This commit is contained in:
Gregory Schier
2024-07-20 10:28:50 -07:00
parent 54d9a78474
commit d26d20180e
5 changed files with 22 additions and 21 deletions

View File

@@ -89,15 +89,6 @@ jobs:
- name: Install yaak CLI - name: Install yaak CLI
run: go install github.com/yaakapp/yaakcli@latest run: go install github.com/yaakapp/yaakcli@latest
- name: Build plugins
working-directory: ${{ env.YAAK_PLUGINS_DIR }}
run: |
npm ci
npm run build
- name: Copy plugins
run: node scripts/copy-plugins.cjs
- name: Run lint - name: Run lint
run: npm run lint run: npm run lint
@@ -111,6 +102,7 @@ jobs:
- uses: tauri-apps/tauri-action@v0 - uses: tauri-apps/tauri-action@v0
env: env:
YAAK_PLUGINS_DIR: ${{ env.YAAK_PLUGINS_DIR }}
NODE_ARCH: ${{ matrix.node_arch }} NODE_ARCH: ${{ matrix.node_arch }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}

View File

@@ -15,8 +15,9 @@
"build:icon:dev": "tauri icon design/icon-dev.png --output ./src-tauri/icons/dev", "build:icon:dev": "tauri icon design/icon-dev.png --output ./src-tauri/icons/dev",
"build": "run-p build:*", "build": "run-p build:*",
"build:js": "vite build", "build:js": "vite build",
"build:download-protoc": "node scripts/download-protoc.cjs", "build:vendor-protoc": "node scripts/vendor-protoc.cjs",
"build:plugin-runtime": "npm run --prefix plugin-runtime build && node scripts/copy-plugins.cjs", "build:vendor-plugins": "node scripts/vendor-plugins.cjs",
"build:plugin-runtime": "npm run --prefix plugin-runtime build",
"test": "vitest", "test": "vitest",
"coverage": "vitest run --coverage", "coverage": "vitest run --coverage",
"prepare": "husky install", "prepare": "husky install",

View File

@@ -49,15 +49,16 @@ try {
unlinkSync(blobPath); unlinkSync(blobPath);
console.log('Re-signing Node.js'); // NOTE: Don't need to resign, as Tauri will sign the sidecar binaries during release
try { // console.log('Re-signing Node.js');
if (process.platform === 'darwin') execSync(`codesign --sign - ${tmpNodePath}`); // try {
else if (process.platform === 'win32') execSync(`"${getSigntoolLocation()}" sign /fd SHA256 ${tmpNodePath}`); // // if (process.platform === 'darwin') execSync(`codesign --sign - ${tmpNodePath}`);
/* Nothing for Linux */ // // else if (process.platform === 'win32') execSync(`"${getSigntoolLocation()}" sign /fd SHA256 ${tmpNodePath}`);
} catch (err) { // /* Nothing for Linux */
console.log('Failed sign', err); // } catch (err) {
process.exit(1); // console.log('Failed sign', err);
} // process.exit(1);
// }
const key = `${process.platform}_${process.env.NODE_ARCH ?? process.arch}`; const key = `${process.platform}_${process.env.NODE_ARCH ?? process.arch}`;
const dstPath = path.join(destDir, DST_BIN_MAP[key]); const dstPath = path.join(destDir, DST_BIN_MAP[key]);

View File

@@ -1,12 +1,19 @@
const {readdirSync, cpSync} = require("node:fs"); const {readdirSync, cpSync} = require("node:fs");
const path = require("node:path"); const path = require("node:path");
console.log('-----> Starting copy plugins script'); const {execSync} = require("node:child_process");
const PLUGINS_DIR = process.env.YAAK_PLUGINS_DIR; const PLUGINS_DIR = process.env.YAAK_PLUGINS_DIR;
if (!PLUGINS_DIR) { if (!PLUGINS_DIR) {
console.log("YAAK_PLUGINS_DIR is not set"); console.log("YAAK_PLUGINS_DIR is not set");
process.exit(1); process.exit(1);
} }
console.log('Installing Yaak plugins dependencies', PLUGINS_DIR);
execSync('npm ci', {cwd: PLUGINS_DIR});
console.log('Building Yaak plugins', PLUGINS_DIR);
execSync('npm run build', {cwd: PLUGINS_DIR});
console.log('Copying Yaak plugins to', PLUGINS_DIR);
const pluginsRoot = path.join(PLUGINS_DIR, 'plugins'); const pluginsRoot = path.join(PLUGINS_DIR, 'plugins');
for (const name of readdirSync(pluginsRoot)) { for (const name of readdirSync(pluginsRoot)) {
const dir = path.join(pluginsRoot, name); const dir = path.join(pluginsRoot, name);