Merge db62d43a24 into 9c76e71650

Bump pillow from 7.2 to 10.2.0 in /__tests__/data (#956 )
* Update e2e-cache.yml * Update basic-validation.yml * Pyinstaller upgrade to 5.13.1 * pyinstaller-update * Update basic-validation.yml * Update e2e-cache.yml * fix-db-alert-164-165-166 * upgrade pillow
2024-10-22 13:55:09 +05:45 · 2024-10-21 15:39:11 -05:00 · 2024-10-21 11:42:17 -05:00 · 2024-07-08 09:49:29 +01:00
5 changed files with 53 additions and 4 deletions
--- a/tests/data/requirements.txt
+++ b/tests/data/requirements.txt
@ -30,7 +30,7 @@ pdf2image==1.12.1

 pefile==2021.9.3; python_full_version >= '3.6.0'

-pillow==7.2
+pillow>=10.2.0

 pygments==2.6.1

--- a/tests/utils.test.ts
+++ b/tests/utils.test.ts
@ -13,6 +13,7 @@ import {
  getVersionInputFromPlainFile,
  getVersionInputFromTomlFile,
  getNextPageUrl,
+  isGhes,
  IS_WINDOWS,
  getDownloadFileName
 } from '../src/utils';
@ -195,3 +196,41 @@ describe('getDownloadFileName', () => {
    }
  });
 });
+
+describe('isGhes', () => {
+  const pristineEnv = process.env;
+
+  beforeEach(() => {
+    jest.resetModules();
+    process.env = {...pristineEnv};
+  });
+
+  afterAll(() => {
+    process.env = pristineEnv;
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable is not defined', async () => {
+    delete process.env['GITHUB_SERVER_URL'];
+    expect(isGhes()).toBeFalsy();
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable is set to github.com', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://github.com';
+    expect(isGhes()).toBeFalsy();
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable is set to a GitHub Enterprise Cloud-style URL', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://contoso.ghe.com';
+    expect(isGhes()).toBeFalsy();
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable has a .localhost suffix', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://mock-github.localhost';
+    expect(isGhes()).toBeFalsy();
+  });
+
+  it('returns true when the GITHUB_SERVER_URL environment variable is set to some other URL', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://src.onpremise.fabrikam.com';
+    expect(isGhes()).toBeTruthy();
+  });
+});
--- a/action.yml
+++ b/action.yml
@ -37,7 +37,7 @@ runs:
  using: 'node20'
  main: 'dist/setup/index.js'
  post: 'dist/cache-save/index.js'
-  post-if: success()
+  post-if: 'success() && github.event.inputs.cache'
 branding:
  icon: 'code'
  color: 'yellow'
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@ -92017,7 +92017,11 @@ function validatePythonVersionFormatForPyPy(version) {
 exports.validatePythonVersionFormatForPyPy = validatePythonVersionFormatForPyPy;
 function isGhes() {
    const ghUrl = new URL(process.env['GITHUB_SERVER_URL'] || 'https://github.com');
-    return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
+    const hostname = ghUrl.hostname.trimEnd().toUpperCase();
+    const isGitHubHost = hostname === 'GITHUB.COM';
+    const isGitHubEnterpriseCloudHost = hostname.endsWith('.GHE.COM');
+    const isLocalHost = hostname.endsWith('.LOCALHOST');
+    return !isGitHubHost && !isGitHubEnterpriseCloudHost && !isLocalHost;
 }
 exports.isGhes = isGhes;
 function isCacheFeatureAvailable() {
--- a/src/utils.ts
+++ b/src/utils.ts
@ -116,7 +116,13 @@ export function isGhes(): boolean {
  const ghUrl = new URL(
    process.env['GITHUB_SERVER_URL'] || 'https://github.com'
  );
-  return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
+
+  const hostname = ghUrl.hostname.trimEnd().toUpperCase();
+  const isGitHubHost = hostname === 'GITHUB.COM';
+  const isGitHubEnterpriseCloudHost = hostname.endsWith('.GHE.COM');
+  const isLocalHost = hostname.endsWith('.LOCALHOST');
+
+  return !isGitHubHost && !isGitHubEnterpriseCloudHost && !isLocalHost;
 }

 export function isCacheFeatureAvailable(): boolean {
Author	SHA1	Message	Date
Ed Morley	51eb1a75a2	Merge `db62d43a24` into `9c76e71650`	2024-10-22 13:55:09 +05:45
aparnajyothi-y	9c76e71650	Bump pillow from 7.2 to 10.2.0 in /__tests__/data (#956 ) * Update e2e-cache.yml * Update basic-validation.yml * Pyinstaller upgrade to 5.13.1 * pyinstaller-update * Update basic-validation.yml * Update e2e-cache.yml * fix-db-alert-164-165-166 * upgrade pillow	2024-10-21 15:39:11 -05:00
John Wesley Walker III	f4c5a1183d	Revise `isGhes` logic (#963 ) * Revise `isGhes` logic * ran `npm run format` * add unit test * ran `npm run format`	2024-10-21 11:42:17 -05:00
Ed Morley	db62d43a24	Skip the post run step entirely if the cache is disabled Previously if the `cache: false` (the default for this Action), the Action's "post run" step would still be executed. Whilst this step was fast (since it returned early if the cache was disabled), it still causes unnecessary noise in the job's steps list. For example as seen in: https://github.com/pypa/get-pip/actions/runs/8679713478/job/23798960684 Now, the post run step is skipped if the cache is disabled, thanks to the `post-if` syntax supporting the `github.events.inputs.*` context. See: https://docs.github.com/en/actions/creating-actions/metadata-syntax-for-github-actions#runspost-if `0c45773b62/action.yml (L40)`	2024-07-08 09:49:29 +01:00