うごかなくなったので、既知動作版 5573ff8 に復元

Author: nmori

.github/workflows/compile-and-release.yml

@@ -105,34 +105,11 @@ jobs:
 
       - name: Build for Platform
         run: grunt build
-        # Bound the step so a stalled @electron/packager fails fast instead of hanging for hours,
-        # and turn on packager/prune debug logging so the CI log shows exactly which step stalls
-        # (download, extract, copy, prune/galactus tree walk, asar, or move).
-        timeout-minutes: 25
-        env:
-          DEBUG: electron-packager,extract-zip,galactus,flora-colossus
-
-      - name: List build output (debug)
-        if: always()
-        shell: bash
-        run: |
-          echo "=== workspace: $(pwd) ==="
-          echo "=== dist/install (recursive) ==="
-          ls -laR dist/install 2>/dev/null || echo "(no dist/install directory)"
-          echo "=== dist/pack subdirs (top level) ==="
-          for d in dist/pack/*/; do echo "-- $d"; ls -la "$d" 2>/dev/null | head -30; done 2>/dev/null || echo "(no dist/pack)"
 
       - name: Verify macOS arm64 DMG symlinks
         if: runner.os == 'macOS'
         shell: bash
         run: |
-          # Informational post-build check of the already-produced arm64 .dmg. `grunt build`
-          # has already fixed the framework symlinks and ad-hoc signed the app
-          # (grunt/fix-macos-symlinks.js), so this step only reports status and must NOT fail the
-          # release. The default `shell: bash` runs with `-e -o pipefail`; without `set +e` a flaky
-          # `hdiutil detach` (resource busy) or an advisory codesign/spctl result would abort the
-          # whole job even though the .dmg is valid.
-          set +e
           DMG=$(ls ./dist/install/darwin/firebot-v*-macos-arm64.dmg 2>/dev/null || echo "")
           if [ -z "$DMG" ]; then
             echo "arm64 DMG not found - skipping verification"
@@ -147,26 +124,11 @@ jobs:
           echo "arm64 - Versions/Current -> $CUR"
           echo "arm64 - Electron Framework -> $EF"
 
-          # Code signature / Gatekeeper checks are advisory: the app is ad-hoc signed (no Apple
-          # Developer ID / notarization), so codesign may report issues and spctl always rejects.
-          echo "Verifying code signature (advisory)..."
-          codesign --verify --deep --strict --verbose=2 "$MOUNT/Firebot.app" \
-            && echo "codesign: valid" \
-            || echo "codesign: reported issues (expected for ad-hoc build)"
+          hdiutil detach "$MOUNT"
 
-          echo "Assessing with Gatekeeper (advisory)..."
-          spctl --assess --verbose=2 "$MOUNT/Firebot.app" \
-            && echo "spctl: accepted" \
-            || echo "spctl: rejected (expected for an un-notarized ad-hoc build)"
-
-          hdiutil detach "$MOUNT" || hdiutil detach "$MOUNT" -force || true
-
-          if [ "$CUR" = "A" ] && [ "$EF" = "Versions/Current/Electron Framework" ]; then
-            echo "✓ arm64 DMG symlink check passed"
-          else
-            echo "⚠ arm64 DMG symlinks unexpected (Versions/Current='$CUR', Electron Framework='$EF') - reporting only, not failing the build"
-          fi
-          exit 0
+          test "$CUR" = "A" || (echo "ERROR: Versions/Current is not relative to A" && exit 1)
+          test "$EF" = "Versions/Current/Electron Framework" || (echo "ERROR: Electron Framework symlink is broken" && exit 1)
+          echo "✓ arm64 DMG symlinks verified successfully"
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
@@ -197,15 +159,12 @@ jobs:
           name: Release v${{ needs.checkversion.outputs.version }}
           body: ${{ format(needs.checkversion.outputs.template, needs.checkversion.outputs.version, needs.checkversion.outputs.commits) }}
           generate_release_notes: false
-          # Use wildcards instead of exact version strings: Squirrel normalizes the .nupkg version
-          # (drops the "+9" build metadata, so firebot-5.66.5-full.nupkg, not firebot-5.66.5+9-...),
-          # and matching by extension is robust to any version-string differences between tools.
           files: |
-            ./bundles/Windows/*-setup.exe
-            ./bundles/Windows/*-full.nupkg
+            ./bundles/Windows/firebot-v${{ needs.checkversion.outputs.version }}-setup.exe
+            ./bundles/Windows/firebot-${{ needs.checkversion.outputs.version }}-full.nupkg
             ./bundles/Windows/RELEASES
-            ./bundles/Linux/*-linux-x64.tar.gz
-            ./bundles/Linux/*-linux-x64.deb
-            ./bundles/Linux/*-linux-x64.rpm
-            ./bundles/macOS/*-macos-x64.dmg
-            ./bundles/macOS/*-macos-arm64.dmg
+            ./bundles/Linux/firebot-v${{ needs.checkversion.outputs.version }}-linux-x64.tar.gz
+            ./bundles/Linux/firebot-v${{ needs.checkversion.outputs.version }}-linux-x64.deb
+            ./bundles/Linux/firebot-v${{ needs.checkversion.outputs.version }}-linux-x64.rpm
+            ./bundles/macOS/firebot-v${{ needs.checkversion.outputs.version }}-macos-x64.dmg
+            ./bundles/macOS/firebot-v${{ needs.checkversion.outputs.version }}-macos-arm64.dmg

grunt/compile.js

@@ -28,7 +28,7 @@ module.exports = function (grunt) {
     const linuxInstallerConfig = {
         src: "dist/pack/Firebot-linux-x64",
         dest: "dist/install/Linux",
-        bin: "firebot",
+        bin: "Firebot v5",
         options: {
             productName: "Firebot v5",
             genericName: "Firebot v5",
@@ -132,46 +132,11 @@ module.exports = function (grunt) {
         createDmg().then(done, done);
     });
 
-    // electron-installer-debian/-redhat need `bin` to match the executable electron-packager
-    // actually produced in the pack dir. The name is *supposed* to be "firebot" (grunt/pack.js
-    // passes --executable-name="firebot"), but native-Linux CI runs have produced a differently
-    // named/laid-out binary than local cross-platform packs. Rather than hardcode a guess, detect
-    // the real Electron binary and log the directory so CI failures are diagnosable.
-    const findLinuxBinary = async (packDir, fallback) => {
-        // Non-app files electron-packager always drops at the top level.
-        const noise = new Set([
-            'chrome-sandbox', 'chrome_crashpad_handler', 'chrome_sandbox',
-            'LICENSE', 'LICENSES.chromium.html', 'version'
-        ]);
-        try {
-            const entries = await fsp.readdir(packDir, { withFileTypes: true });
-            grunt.log.writeln(`Contents of ${packDir}:`);
-            entries.forEach(e => grunt.log.writeln(`  ${e.isDirectory() ? '[dir] ' : '      '}${e.name}`));
-
-            // The main binary is the renamed `electron`: a top-level file with no extension
-            // that isn't one of the known companion files.
-            const candidates = entries
-                .filter(e => e.isFile() && !e.name.includes('.') && !noise.has(e.name))
-                .map(e => e.name);
-
-            if (candidates.length === 1) {
-                grunt.log.ok(`Detected Electron binary: ${candidates[0]}`);
-                return candidates[0];
-            }
-            grunt.log.warn(`Could not uniquely detect the Electron binary (candidates: ${candidates.join(', ') || 'none'}). Falling back to "${fallback}".`);
-        } catch (err) {
-            grunt.log.warn(`Could not read ${packDir}: ${err.message}. Falling back to "${fallback}".`);
-        }
-        return fallback;
-    };
-
     grunt.registerTask('create-redhat-installer', 'Create the Redhat .rpm installer', async function () {
         const done = this.async();
         const installer = require('@dennisrijsdijk/electron-installer-redhat');
-        const bin = await findLinuxBinary(linuxInstallerConfig.src, linuxInstallerConfig.bin);
         installer({
             ...linuxInstallerConfig,
-            bin,
             options: {
                 ...linuxInstallerConfig.options,
                 scripts: linuxScriptsRedhat
@@ -187,10 +152,8 @@ module.exports = function (grunt) {
     grunt.registerTask('create-debian-installer', 'Create the Debian .deb installer', async function () {
         const done = this.async();
         const installer = require('electron-installer-debian');
-        const bin = await findLinuxBinary(linuxInstallerConfig.src, linuxInstallerConfig.bin);
         installer({
             ...linuxInstallerConfig,
-            bin,
             options: {
                 ...linuxInstallerConfig.options,
                 scripts: linuxScriptsDebian

grunt/copy.js

@@ -91,35 +91,6 @@ module.exports = function (grunt) {
     grunt.registerTask('copy', function () {
         const platform = grunt.config.get('platform');
         remFiles(platform);
-
-        // Create version file for Linux (required by electron-installer-debian)
-        if (platform === 'linux') {
-            const electronPkg = require('../node_modules/electron/package.json');
-            const packDir = path.join(__dirname, '../dist/pack/Firebot-linux-x64');
-            const resourcesDir = path.join(packDir, 'resources');
-            const appDir = path.join(resourcesDir, 'app');
-            const versionPath = path.join(packDir, 'version');
-
-            // Ensure directories exist
-            try {
-                fs.mkdirSync(appDir, { recursive: true });
-
-                // Copy package.json to resources/app (required by electron-installer-debian)
-                const packageJsonSrc = path.join(__dirname, '../package.json');
-                const packageJsonDest = path.join(appDir, 'package.json');
-                if (!fs.existsSync(packageJsonDest)) {
-                    fs.copyFileSync(packageJsonSrc, packageJsonDest);
-                    grunt.log.ok(`Copied package.json to ${packageJsonDest}`);
-                }
-
-                // Create version file
-                fs.writeFileSync(versionPath, electronPkg.version, 'utf8');
-                grunt.log.ok(`Created version file: ${versionPath}`);
-            } catch (err) {
-                grunt.log.warn(`Failed to setup Linux build: ${err.message}`);
-            }
-        }
-
         grunt.task.run(`xcopy:${platform}`);
     });
 

grunt/fix-macos-symlinks.js

@@ -61,32 +61,19 @@ module.exports = function (grunt) {
 
                 if (fixedCount > 0) {
                     grunt.log.ok(`Fixed ${fixedCount} absolute symlink(s) in ${appPath}`);
+
+                    // Re-sign the app bundle after symlink modifications
+                    // Symlink changes invalidate the previous code signature
+                    try {
+                        grunt.log.writeln('Re-signing app bundle after symlink fix...');
+                        await execFileAsync('codesign', ['--force', '--deep', '--sign', '-', appPath]);
+                        grunt.log.ok('App bundle re-signed successfully');
+                    } catch (signError) {
+                        grunt.log.warn(`Failed to re-sign app bundle: ${signError.message}`);
+                    }
                 } else {
                     grunt.log.ok(`All symlinks are relative in ${appPath}`);
                 }
-
-                // Always clear stale xattrs and ad-hoc re-sign, regardless of whether symlinks
-                // needed fixing. electron-packager does not sign the app (no osx-sign option), and
-                // adding resources/app, the asar, and the xcopy'd resources after packaging
-                // invalidates Electron's bundled ad-hoc signature. Without a valid signature,
-                // `codesign --verify` fails with "code has no resources but signature indicates they
-                // must be present" and the app refuses to launch on Apple Silicon. Re-signing ad-hoc
-                // (`--sign -`) rebuilds a consistent _CodeSignature/CodeResources seal.
-                try {
-                    grunt.log.writeln('Removing quarantine attributes...');
-                    await execFileAsync('xattr', ['-cr', appPath]);
-                    grunt.log.ok('Quarantine attributes removed');
-                } catch (xattrError) {
-                    grunt.log.warn(`Failed to remove quarantine: ${xattrError.message}`);
-                }
-
-                try {
-                    grunt.log.writeln('Ad-hoc re-signing app bundle...');
-                    await execFileAsync('codesign', ['--force', '--deep', '--sign', '-', appPath]);
-                    grunt.log.ok('App bundle ad-hoc re-signed successfully');
-                } catch (signError) {
-                    grunt.log.warn(`Failed to re-sign app bundle: ${signError.message}`);
-                }
             } catch (error) {
                 grunt.fail.warn(`Failed to fix symlinks: ${error.message}`);
             }

grunt/pack.js

@@ -31,20 +31,20 @@ module.exports = function (grunt) {
     let ignoreFlags;
     try {
         ignoreFlags = formatIgnoreList([
-            { dotfiles: true },
-            { dotdirs: true },
-            { path: 'build/resources' },
-            { path: 'dist' },
-            { path: 'doc' },
-            { path: 'docs' },
-            { path: 'grunt' },
-            { path: 'profiles' },
-            { path: 'src' },
-            { path: 'Gruntfile.js', isFile: true },
-            { path: 'package.lock', isFile: true },
-            { path: 'README.md', isFile: true },
-            { path: 'secrets.gpg', isFile: true },
-            { path: 'tsconfig.json', isFile: true }
+            {dotfiles: true},
+            {dotdirs: true},
+            {path: 'build/resources'},
+            {path: 'dist'},
+            {path: 'doc'},
+            {path: 'docs'},
+            {path: 'grunt'},
+            {path: 'profiles'},
+            {path: 'src'},
+            {path: 'Gruntfile.js', isFile: true},
+            {path: 'package.lock', isFile: true},
+            {path: 'README.md', isFile: true},
+            {path: 'secrets.gpg', isFile: true},
+            {path: 'tsconfig.json', isFile: true}
         ]);
     } catch (err) {
         grunt.fail.fatal(err);
@@ -66,15 +66,6 @@ module.exports = function (grunt) {
         ...ignoreFlags
     ].join(' ');
 
-    // Keep --asar for Linux (matches upstream and the win/mac targets). electron-installer-debian
-    // DOES read metadata from resources/app.asar (electron-installer-common's readMetadata), so the
-    // earlier "doesn't handle asar" assumption was wrong. Packing into a single app.asar instead of
-    // copying ~18k unpacked files avoids the copy stalling on the CI runner. Linux executable names
-    // can't contain spaces, so use "firebot" instead of "Firebot v5".
-    const linuxFlags = flags
-        .replace('--executable-name="Firebot v5"', '--executable-name="firebot"')
-        .trim();
-
     const appPackageJson = grunt.file.readJSON('./package.json');
 
     // electron-packager doesn't like prerelease tags with dots in them for the Windows target
@@ -91,7 +82,7 @@ module.exports = function (grunt) {
                 command: `npx --no-install @electron/packager . Firebot --platform=darwin ${flags.replace('--arch=x64', '')} --arch=x64 --arch=arm64 --extend-info="extra.plist" --extra-resource="./src/resources/firebot-setup-file-icon.icns"`
             },
             packlinux: {
-                command: `npx --no-install @electron/packager . Firebot --platform=linux ${linuxFlags}`
+                command: `npx --no-install @electron/packager . Firebot --platform=linux ${flags}`
             }
         }
     });