chore: cleanup PackSquash < 0.3.1 support code remnants

I'm not interested in supporting older PackSquash versions on newer versions of the action because it requires effort, complicates maintenance, and it might backfire as an excuse for users to don't upgrade, even if they lack good reasons to stay outdated. Unless those older versions happen to be compatible and there are no reasons to drop that support, of course. Let's remove code whose only purpose was to deal with older PackSquash versions that the action rejects anyway.
ComunidadAylas · Oct 11, 2022 · fc12103 · fc12103
1 parent 79e2c36
commit fc12103
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 33 deletions.
diff --git a/dist/main/index.js b/dist/main/index.js
diff --git a/src/packsquash.ts b/src/packsquash.ts
@@ -1,6 +1,6 @@
-import { debug, endGroup, getBooleanInput, getInput, setSecret, startGroup, warning } from '@actions/core';
+import { debug, endGroup, getBooleanInput, getInput, setSecret, startGroup } from '@actions/core';
 import { exec } from '@actions/exec';
-import { readFile, rm, writeFile } from 'fs/promises';
+import { readFile, writeFile } from 'fs/promises';
 import { addProblemMatcher, removeProblemMatcher } from './problem_matcher';
 import { Options } from './options';
 import * as uuid from 'uuid';
@@ -22,39 +22,24 @@ export async function runPackSquash(workingDirectory: WorkingDirectory) {
     debug(`Using system ID: ${systemId}`);
     setSecret(systemId);
 
-    async function run(description: string | null) {
-        await addProblemMatcher(workingDirectory.problemMatcherFile);
-        if (description) {
-            startGroup(`PackSquash output (${description})`);
-        } else {
-            startGroup('PackSquash output');
+    await addProblemMatcher(workingDirectory.problemMatcherFile);
+
+    startGroup('PackSquash output');
+    const exitCode = await exec(workingDirectory.packsquashBinary, [workingDirectory.optionsFile], {
+        env: {
+            PACKSQUASH_SYSTEM_ID: systemId,
+            PACKSQUASH_EMOJI: showEmojiInPacksquashLogs(),
+            PACKSQUASH_COLOR: enableColorInPacksquashLogs()
         }
-        const exitCode = await exec(workingDirectory.packsquashBinary, [workingDirectory.optionsFile], {
-            env: {
-                PACKSQUASH_SYSTEM_ID: systemId,
-                PACKSQUASH_EMOJI: showEmojiInPacksquashLogs(),
-                PACKSQUASH_COLOR: enableColorInPacksquashLogs()
-            }
-        });
-        endGroup();
-        removeProblemMatcher(workingDirectory.problemMatcherFile);
-        return exitCode;
-    }
+    });
+    endGroup();
+
+    removeProblemMatcher(workingDirectory.problemMatcherFile);
 
-    let exitCode = await run(null);
     switch (exitCode) {
         case 0:
             // Success
             break;
-        case 129:
-            // Actionable error code returned by v0.3.0 only
-            warning('PackSquash reported that the previous ZIP file could not be used to speed up processing. Discarding it.');
-            await rm(workingDirectory.outputFile);
-            exitCode = await run('discarded previous ZIP file');
-            if (exitCode !== 0) {
-                throw new Error(`PackSquash finished with an error code: ${exitCode}`);
-            }
-            break;
         default:
             // Any other PackSquash error
             throw new Error(`PackSquash finished with an error code: ${exitCode}`);

diff --git a/src/problem_matcher.ts b/src/problem_matcher.ts
@@ -8,7 +8,7 @@ const json = {
             severity: 'error',
             pattern: [
                 {
-                    regexp: '^(?:\x1B\\[\\d+\\w*)*[!❌] (?!.*Invalid stick parity bit)(.+?)(?:\x1B\\[0m)?$',
+                    regexp: '^(?:\x1B\\[\\d+\\w*)*[!❌] (.+?)(?:\x1B\\[0m)?$',
                     message: 1
                 },
                 {