Add bootstrap step for packaging tools

Added a step to bootstrap packaging tools before installing dependencies.

.github/workflows/e2e-cache.yml

@@ -145,7 +145,8 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Install poetry
-        run: pipx install poetry
+        run: |
+          pipx install poetry
       - name: Init pyproject.toml
         run: mv ./__tests__/data/pyproject.toml .
       - name: Setup Python
@@ -153,6 +154,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'poetry'
+      - name: Bootstrap packaging
+        run: |
+          python -m ensurepip --upgrade
+          python -m pip install --upgrade pip setuptools wheel packaging
       - name: Install dependencies
         run: poetry install --no-root
 

.github/workflows/test-pypy.yml

@@ -40,7 +40,7 @@ jobs:
           - 'pypy-3.10-v7.3.x'
           - 'pypy-3.10-v7.x'
           - 'pypy-2.7-v7.3.12rc1'
-          - 'pypy-3.10-nightly'
+          - 'pypy-3.11-nightly'
           - 'pypy3.10-v7.3.17'
           - 'pypy3.11-v7.3.19'
 
@@ -146,7 +146,7 @@ jobs:
             ubuntu-latest,
             macos-15-intel
           ]
-        pypy: ['pypy2.7', 'pypy3.9', 'pypy3.10-nightly', 'pypy3.11']
+        pypy: ['pypy2.7', 'pypy3.9', 'pypy3.11-nightly', 'pypy3.11']
 
     steps:
       - name: Checkout

.licenses/npm/@nodable/entities.dep.yml

@@ -0,0 +1,11 @@
+---
+name: "@nodable/entities"
+version: 2.2.0
+type: npm
+summary: Entity parser for XML, HTML, External entites with security and NCR control
+homepage:
+license: mit
+licenses:
+- sources: README.md
+  text: MIT
+notices: []

.licenses/npm/anynum.dep.yml

@@ -0,0 +1,35 @@
+---
+name: anynum
+version: 1.0.0
+type: npm
+summary: Normalize all Unicode decimal digits (Devanagari, Arabic, Thai, etc.) to
+  ASCII numerals. Zero dependencies, performance-first.
+homepage:
+license: mit
+licenses:
+- sources: LICENSE
+  text: |
+    MIT License
+
+    Copyright (c) 2026 Natural Intelligence
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+- sources: README.md
+  text: MIT
+notices: []

.licenses/npm/fast-xml-builder.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: fast-xml-builder
-version: 1.1.4
+version: 1.2.0
 type: npm
 summary: Build XML from JSON without C/C++ based libraries
 homepage:

.licenses/npm/fast-xml-parser.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: fast-xml-parser
-version: 5.5.10
+version: 5.8.0
 type: npm
 summary: Validate XML, Parse XML, Build XML without C/C++ based libraries
 homepage:

.licenses/npm/path-expression-matcher.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: path-expression-matcher
-version: 1.4.0
+version: 1.5.0
 type: npm
 summary: Efficient path tracking and pattern matching for XML/JSON parsers
 homepage: https://github.com/NaturalIntelligence/path-expression-matcher#readme

.licenses/npm/strnum.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: strnum
-version: 2.2.3
+version: 2.4.0
 type: npm
 summary: Parse String to Number based on configuration
 homepage:

.licenses/npm/xml-naming.dep.yml

@@ -0,0 +1,12 @@
+---
+name: xml-naming
+version: 0.1.0
+type: npm
+summary: Validates XML name productions — Name, NCName, QName, NMToken, NMTokens —
+  for XML 1.0 and 1.1
+homepage:
+license: mit
+licenses:
+- sources: README.md
+  text: MIT
+notices: []

__tests__/cache-restore.test.ts

@@ -190,12 +190,19 @@ virtualenvs.path = "{cache-dir}/virtualenvs"  # /Users/patrick/Library/Caches/py
 
         restoredKeys.forEach(restoredKey => {
           if (restoredKey) {
-            const osSegment =
+            if (process.platform === 'linux' && packageManager === 'pip') {
-              process.platform === 'linux' ? '-20.04-Ubuntu' : '';
+              expect(infoSpy).toHaveBeenCalledWith(
-            const versionSuffix = packageManager === 'poetry' ? '-v2' : '';
+                `Cache restored from key: setup-python-${process.env['RUNNER_OS']}-${process.arch}-20.04-Ubuntu-python-${pythonVersion}-${packageManager}-${fileHash}`
-            expect(infoSpy).toHaveBeenCalledWith(
+              );
-              `Cache restored from key: setup-python-${process.env['RUNNER_OS']}-${process.arch}${osSegment}-python-${pythonVersion}-${packageManager}${versionSuffix}-${fileHash}`
+            } else if (packageManager === 'poetry') {
-            );
+              expect(infoSpy).toHaveBeenCalledWith(
+                `Cache restored from key: setup-python-${process.env['RUNNER_OS']}-${process.arch}-python-${pythonVersion}-${packageManager}-v2-${fileHash}`
+              );
+            } else {
+              expect(infoSpy).toHaveBeenCalledWith(
+                `Cache restored from key: setup-python-${process.env['RUNNER_OS']}-${process.arch}-python-${pythonVersion}-${packageManager}-${fileHash}`
+              );
+            }
           } else {
             expect(infoSpy).toHaveBeenCalledWith(
               `${packageManager} cache is not found`

__tests__/data/pyproject.toml

@@ -9,6 +9,7 @@ python = ">=3.9,<3.14"
 flake8 = "^4.0.1"
 pyinstaller = "6.10.0"
 setuptools = ">=78.1.1" 
+packaging = ">=22.0,<26"
 
 [tool.poetry.dev-dependencies]
 

__tests__/data/requirements-linux.txt

@@ -1,12 +1,12 @@
 certifi==2020.6.20
 chardet==3.0.4
 docutils==0.16
-idna==3.7
+idna==3.15
 Kivy==2.0.0rc3
 Kivy-Garden==0.1.4
 packaging==20.7
 pdf2image==1.12.1
-Pygments==2.6.1
+Pygments==2.20.0
-requests==2.32.4
+requests==2.33.0
-urllib3==2.6.3
+urllib3==2.7.0
 xlrd==1.2.0

__tests__/data/requirements.txt

@@ -8,7 +8,7 @@ docutils==0.16
 
 future==0.18.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'
 
-idna==3.7
+idna==3.15
 
 itsdangerous==1.1.0
 
@@ -32,7 +32,7 @@ pefile==2021.9.3; python_full_version >= '3.6.0'
 
 pillow>=10.2.0
 
-pygments==2.6.1
+pygments==2.20.0
 
 pyinstaller==6.10.0
 
@@ -40,8 +40,8 @@ pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3
 
 pywin32-ctypes==0.2.0
 
-requests==2.32.4
+requests==2.33.0
 
-urllib3==2.6.3
+urllib3==2.7.0
 
 xlrd==1.2.0

package-lock.json

@@ -1512,6 +1512,18 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@nodable/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-9uGyhaQavEUMC8AIddIjau4NsnsXhou+j5sBAGojCM1oxmQpVKTWR/9JxABD6UAv12vpIms55fPZKFQEhG6uBg==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodable"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -2078,6 +2090,18 @@
         "node": ">= 8"
       }
     },
+    "node_modules/anynum": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/anynum/-/anynum-1.0.0.tgz",
+      "integrity": "sha512-xjR9/zBVnUOP6ztMIIgShjsxui80nQUQH+5xJnvrYLs+90bF25/KJqaAi8mk+B4RDtX1Nspi6fmp4YTEts8SfA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -3109,9 +3133,9 @@
       "license": "MIT"
     },
     "node_modules/fast-xml-builder": {
-      "version": "1.1.4",
+      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.2.0.tgz",
-      "integrity": "sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==",
+      "integrity": "sha512-00aAWieqff+ZJhsXA4g1g7M8k+7AYoMUUHF+/zFb5U6Uv/P0Vl4QZo84/IcufzYalLuEj9928bXN9PbbFzMF0Q==",
       "funding": [
         {
           "type": "github",
@@ -3120,13 +3144,14 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "path-expression-matcher": "^1.1.3"
+        "path-expression-matcher": "^1.5.0",
+        "xml-naming": "^0.1.0"
       }
     },
     "node_modules/fast-xml-parser": {
-      "version": "5.5.10",
+      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.10.tgz",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.8.0.tgz",
-      "integrity": "sha512-go2J2xODMc32hT+4Xr/bBGXMaIoiCwrwp2mMtAvKyvEFW6S/v5Gn2pBmE4nvbwNjGhpcAiOwEv7R6/GZ6XRa9w==",
+      "integrity": "sha512-6bIM7fsJxeo3uXv7OncQYsBAMPJ7V16Slahl/6M98C/i2q+vB1+4a0MtrvYwDFEUrwDSbAmeLDRXsOBwrL7yAg==",
       "funding": [
         {
           "type": "github",
@@ -3135,9 +3160,11 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "fast-xml-builder": "^1.1.4",
+        "@nodable/entities": "^2.1.0",
-        "path-expression-matcher": "^1.2.1",
+        "fast-xml-builder": "^1.2.0",
-        "strnum": "^2.2.2"
+        "path-expression-matcher": "^1.5.0",
+        "strnum": "^2.3.0",
+        "xml-naming": "^0.1.0"
       },
       "bin": {
         "fxparser": "src/cli/cli.js"
@@ -4767,9 +4794,9 @@
       }
     },
     "node_modules/path-expression-matcher": {
-      "version": "1.4.0",
+      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.5.0.tgz",
-      "integrity": "sha512-s4DQMxIdhj3jLFWd9LxHOplj4p9yQ4ffMGowFf3cpEgrrJjEhN0V5nxw4Ye1EViAGDoL4/1AeO6qHpqYPOzE4Q==",
+      "integrity": "sha512-cbrerZV+6rvdQrrD+iGMcZFEiiSrbv9Tfdkvnusy6y0x0GKBXREFg/Y65GhIfm0tnLntThhzCnfKwp1WRjeCyQ==",
       "funding": [
         {
           "type": "github",
@@ -5365,16 +5392,19 @@
       }
     },
     "node_modules/strnum": {
-      "version": "2.2.3",
+      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.4.0.tgz",
-      "integrity": "sha512-oKx6RUCuHfT3oyVjtnrmn19H1SiCqgJSg+54XqURKp5aCMbrXrhLjRN9TjuwMjiYstZ0MzDrHqkGZ5dFTKd+zg==",
+      "integrity": "sha512-sHrVyWWdq28RbhjuJdZsA1SnGRJV6NiXbk6AXBxDOsgAcA+lmpUZCYjOdLBxkXMwis6RRe7dlZt4VlIWFVzkmg==",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/NaturalIntelligence"
         }
       ],
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "anynum": "^1.0.0"
+      }
     },
     "node_modules/supports-color": {
       "version": "7.2.0",
@@ -5766,6 +5796,21 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
+    "node_modules/xml-naming": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/xml-naming/-/xml-naming-0.1.0.tgz",
+      "integrity": "sha512-k8KO9hrMyNk6tUWqUfkTEZbezRRpONVOzUTnc97VnCvyj6Tf9lyUR9EDAIeiVLv56jsMcoXEwjW8Kv5yPY52lw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",

src/cache-distributions/cache-distributor.ts

@@ -1,6 +1,5 @@
 import * as cache from '@actions/cache';
 import * as core from '@actions/core';
-import {getOSInfo, IS_LINUX} from '../utils';
 import {CACHE_DEPENDENCY_BACKUP_PATH} from './constants';
 
 export enum State {
@@ -23,33 +22,6 @@ abstract class CacheDistributor {
   }>;
   protected async handleLoadedCache() {}
 
-  /**
-   * Builds the Linux distro portion of a cache key (e.g. `-26.04-Ubuntu`, `-9-rhel`).
-   * RHEL is keyed by major version since it ships one ABI-stable artifact per major.
-   */
-  protected async getLinuxInfoKeySegment(): Promise<string> {
-    if (!IS_LINUX) {
-      return '';
-    }
-
-    const osInfo = await getOSInfo();
-    if (!osInfo) {
-      return '';
-    }
-
-    // lsb_release reports RHEL as "RedHatEnterpriseLinux" while /etc/os-release
-    // reports it as "rhel"; normalize both to "rhel" so the key is consistent.
-    const normalizedName = osInfo.osName.toLowerCase();
-    const isRhel =
-      normalizedName === 'rhel' || normalizedName.includes('redhat');
-    const osName = isRhel ? 'rhel' : osInfo.osName;
-    const osVersion = isRhel
-      ? osInfo.osVersion.split('.')[0]
-      : osInfo.osVersion;
-
-    return `-${osVersion}-${osName}`;
-  }
-
   public async restoreCache() {
     const {primaryKey, restoreKey} = await this.computeKeys();
     if (primaryKey.endsWith('-')) {

src/cache-distributions/pip-cache.ts

@@ -7,7 +7,7 @@ import * as path from 'path';
 import os from 'os';
 
 import CacheDistributor from './cache-distributor';
-import {IS_WINDOWS} from '../utils';
+import {getLinuxInfo, IS_LINUX, IS_WINDOWS} from '../utils';
 import {CACHE_DEPENDENCY_BACKUP_PATH} from './constants';
 
 class PipCache extends CacheDistributor {
@@ -62,9 +62,17 @@ class PipCache extends CacheDistributor {
     const hash =
       (await glob.hashFiles(this.cacheDependencyPath)) ||
       (await glob.hashFiles(this.cacheDependencyBackupPath));
-    const osSegment = await this.getLinuxInfoKeySegment();
+    let primaryKey = '';
-    const primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}${osSegment}-python-${this.pythonVersion}-${this.packageManager}-${hash}`;
+    let restoreKey = '';
-    const restoreKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}${osSegment}-python-${this.pythonVersion}-${this.packageManager}`;
+
+    if (IS_LINUX) {
+      const osInfo = await getLinuxInfo();
+      primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}-${osInfo.osVersion}-${osInfo.osName}-python-${this.pythonVersion}-${this.packageManager}-${hash}`;
+      restoreKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}-${osInfo.osVersion}-${osInfo.osName}-python-${this.pythonVersion}-${this.packageManager}`;
+    } else {
+      primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}-python-${this.pythonVersion}-${this.packageManager}-${hash}`;
+      restoreKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}-python-${this.pythonVersion}-${this.packageManager}`;
+    }
 
     return {
       primaryKey,

src/cache-distributions/pipenv-cache.ts

@@ -32,8 +32,7 @@ class PipenvCache extends CacheDistributor {
 
   protected async computeKeys() {
     const hash = await glob.hashFiles(this.patterns);
-    const osSegment = await this.getLinuxInfoKeySegment();
+    const primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}-python-${this.pythonVersion}-${this.packageManager}-${hash}`;
-    const primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}${osSegment}-python-${this.pythonVersion}-${this.packageManager}-${hash}`;
     const restoreKey = undefined;
     return {
       primaryKey,

src/cache-distributions/poetry-cache.ts

@@ -46,9 +46,8 @@ class PoetryCache extends CacheDistributor {
 
   protected async computeKeys() {
     const hash = await glob.hashFiles(this.patterns);
-    const osSegment = await this.getLinuxInfoKeySegment();
     // "v2" is here to invalidate old caches of this cache distributor, which were created broken:
-    const primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}${osSegment}-python-${this.pythonVersion}-${this.packageManager}-v2-${hash}`;
+    const primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}-python-${this.pythonVersion}-${this.packageManager}-v2-${hash}`;
     const restoreKey = undefined;
     return {
       primaryKey,

src/install-python.ts

@@ -3,8 +3,6 @@ import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
 import * as exec from '@actions/exec';
 import * as httpm from '@actions/http-client';
-import * as fs from 'fs';
-import * as semver from 'semver';
 import {ExecOptions} from '@actions/exec/lib/interfaces';
 import {IS_WINDOWS, IS_LINUX, getDownloadFileName} from './utils';
 import {IToolRelease} from '@actions/tool-cache';
@@ -16,70 +14,6 @@ const MANIFEST_REPO_NAME = 'python-versions';
 const MANIFEST_REPO_BRANCH = 'main';
 export const MANIFEST_URL = `https://raw.githubusercontent.com/${MANIFEST_REPO_OWNER}/${MANIFEST_REPO_NAME}/${MANIFEST_REPO_BRANCH}/versions-manifest.json`;
 
-interface LinuxOsRelease {
-  id: string;
-  versionId: string;
-}
-
-function getLinuxOsRelease(): LinuxOsRelease | null {
-  try {
-    const content = fs.readFileSync('/etc/os-release', 'utf8');
-    const lines = content.split('\n');
-    let id = '';
-    let versionId = '';
-    for (const line of lines) {
-      const parts = line.split('=');
-      if (parts.length === 2) {
-        const key = parts[0].trim();
-        const value = parts[1].trim().replace(/^"/, '').replace(/"$/, '');
-        if (key === 'ID') id = value;
-        if (key === 'VERSION_ID') versionId = value;
-      }
-    }
-    if (id && versionId) {
-      return {id, versionId};
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
-
-function findRhelRelease(
-  semanticVersionSpec: string,
-  architecture: string,
-  manifest: tc.IToolRelease[],
-  osVersion: string
-): tc.IToolRelease | undefined {
-  for (const candidate of manifest) {
-    const version = candidate.version;
-    core.debug(`check ${version} satisfies ${semanticVersionSpec}`);
-
-    if (!semver.satisfies(version, semanticVersionSpec)) continue;
-
-    const file = candidate.files.find(item => {
-      core.debug(
-        `${item.arch}===${architecture} && ${item.platform}===rhel && ${item.platform_version}===${osVersion}`
-      );
-      const archMatch = item.arch === architecture;
-      const platformMatch = item.platform === 'rhel';
-      const versionMatch =
-        !item.platform_version ||
-        item.platform_version === osVersion ||
-        osVersion.startsWith(item.platform_version);
-      return archMatch && platformMatch && versionMatch;
-    });
-
-    if (file) {
-      core.debug(`matched ${candidate.version}`);
-      const result = Object.assign({}, candidate);
-      result.files = [file];
-      return result;
-    }
-  }
-  return undefined;
-}
-
 export async function findReleaseFromManifest(
   semanticVersionSpec: string,
   architecture: string,
@@ -89,23 +23,6 @@ export async function findReleaseFromManifest(
     manifest = await getManifest();
   }
 
-  // On RHEL, tc.findFromManifest() won't match because os.platform() returns 'linux'
-  // but manifest entries use platform 'rhel'. Use custom filtering for RHEL.
-  if (IS_LINUX) {
-    const osRelease = getLinuxOsRelease();
-    if (osRelease && osRelease.id === 'rhel') {
-      core.debug(
-        `Detected RHEL ${osRelease.versionId}, using custom manifest filtering`
-      );
-      return findRhelRelease(
-        semanticVersionSpec,
-        architecture,
-        manifest,
-        osRelease.versionId
-      );
-    }
-  }
-
   const foundRelease = await tc.findFromManifest(
     semanticVersionSpec,
     false,
@@ -115,7 +32,6 @@ export async function findReleaseFromManifest(
 
   return foundRelease;
 }
-
 function isIToolRelease(obj: any): obj is IToolRelease {
   return (
     typeof obj === 'object' &&
@@ -132,7 +48,6 @@ function isIToolRelease(obj: any): obj is IToolRelease {
     )
   );
 }
-
 export async function getManifest(): Promise<tc.IToolRelease[]> {
   try {
     const repoManifest = await getManifestFromRepo();

src/utils.ts

@@ -173,38 +173,15 @@ async function getMacOSInfo() {
 }
 
 export async function getLinuxInfo() {
-  try {
+  const {stdout} = await exec.getExecOutput('lsb_release', ['-i', '-r', '-s'], {
-    const {stdout} = await exec.getExecOutput(
+    silent: true
-      'lsb_release',
+  });
-      ['-i', '-r', '-s'],
-      {
-        silent: true
-      }
-    );
 
-    const [osName, osVersion] = stdout.trim().split('\n');
+  const [osName, osVersion] = stdout.trim().split('\n');
-    core.debug(`OS Name: ${osName}, Version: ${osVersion}`);
-    return {osName, osVersion};
-  } catch (err) {
-    core.debug(
-      `lsb_release failed (${(err as Error).message}). Falling back to /etc/os-release.`
-    );
 
-    const osReleaseContent = fs.readFileSync('/etc/os-release', 'utf8');
+  core.debug(`OS Name: ${osName}, Version: ${osVersion}`);
-    const osInfo: {[key: string]: string} = {};
 
-    osReleaseContent.split('\n').forEach(line => {
+  return {osName: osName, osVersion: osVersion};
-      const [key, value] = line.split('=');
-      if (key && value) {
-        osInfo[key.trim()] = value.trim().replace(/"/g, '');
-      }
-    });
-
-    const osName = osInfo['ID'] || 'Linux';
-    const osVersion = osInfo['VERSION_ID'] || '';
-    core.debug(`OS Name: ${osName}, Version: ${osVersion}`);
-    return {osName, osVersion};
-  }
 }
 
 export async function getOSInfo() {