diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml index 00f5036..42f67e6 100644 --- a/.github/workflows/check-dist.yml +++ b/.github/workflows/check-dist.yml @@ -27,6 +27,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: 16.x + cache: npm - name: Install dependencies run: npm ci - name: Rebuild the dist/ directory diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 60410a6..3c28f5d 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -25,17 +25,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: 16.x - - name: Determine npm cache directory - id: npm-cache - run: | - echo "::set-output name=dir::$(npm config get cache)" - - name: Restore npm cache - uses: actions/cache@v3 - with: - path: ${{ steps.npm-cache.outputs.dir }} - key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-node- + cache: npm - run: npm ci - name: Prettier Format Check run: npm run format-check diff --git a/dist/restore/index.js b/dist/restore/index.js index 4fe9a05..26ddd0f 100644 --- a/dist/restore/index.js +++ b/dist/restore/index.js @@ -38485,17 +38485,16 @@ function getInputAsInt(name, options) { } exports.getInputAsInt = getInputAsInt; function isCacheFeatureAvailable() { - if (!cache.isFeatureAvailable()) { - if (isGhes()) { - logWarning(`Cache action is only supported on GHES version >= 3.5. If you are on version >=3.5 Please check with GHES admin if Actions cache service is enabled or not. + if (cache.isFeatureAvailable()) { + return true; + } + if (isGhes()) { + logWarning(`Cache action is only supported on GHES version >= 3.5. If you are on version >=3.5 Please check with GHES admin if Actions cache service is enabled or not. Otherwise please upgrade to GHES version >= 3.5 and If you are also using Github Connect, please unretire the actions/cache namespace before upgrade (see https://docs.github.com/en/enterprise-server@3.5/admin/github-actions/managing-access-to-actions-from-githubcom/enabling-automatic-access-to-githubcom-actions-using-github-connect#automatic-retirement-of-namespaces-for-actions-accessed-on-githubcom)`); - } - else { - logWarning("An internal error has occurred in cache backend. Please check https://www.githubstatus.com/ for any ongoing issue in actions."); - } return false; } - return true; + logWarning("An internal error has occurred in cache backend. Please check https://www.githubstatus.com/ for any ongoing issue in actions."); + return false; } exports.isCacheFeatureAvailable = isCacheFeatureAvailable; diff --git a/dist/save/index.js b/dist/save/index.js index b72bb6b..59bc3f2 100644 --- a/dist/save/index.js +++ b/dist/save/index.js @@ -38491,17 +38491,16 @@ function getInputAsInt(name, options) { } exports.getInputAsInt = getInputAsInt; function isCacheFeatureAvailable() { - if (!cache.isFeatureAvailable()) { - if (isGhes()) { - logWarning(`Cache action is only supported on GHES version >= 3.5. If you are on version >=3.5 Please check with GHES admin if Actions cache service is enabled or not. + if (cache.isFeatureAvailable()) { + return true; + } + if (isGhes()) { + logWarning(`Cache action is only supported on GHES version >= 3.5. If you are on version >=3.5 Please check with GHES admin if Actions cache service is enabled or not. Otherwise please upgrade to GHES version >= 3.5 and If you are also using Github Connect, please unretire the actions/cache namespace before upgrade (see https://docs.github.com/en/enterprise-server@3.5/admin/github-actions/managing-access-to-actions-from-githubcom/enabling-automatic-access-to-githubcom-actions-using-github-connect#automatic-retirement-of-namespaces-for-actions-accessed-on-githubcom)`); - } - else { - logWarning("An internal error has occurred in cache backend. Please check https://www.githubstatus.com/ for any ongoing issue in actions."); - } return false; } - return true; + logWarning("An internal error has occurred in cache backend. Please check https://www.githubstatus.com/ for any ongoing issue in actions."); + return false; } exports.isCacheFeatureAvailable = isCacheFeatureAvailable; diff --git a/src/utils/actionUtils.ts b/src/utils/actionUtils.ts index dacd3a6..7607bf7 100644 --- a/src/utils/actionUtils.ts +++ b/src/utils/actionUtils.ts @@ -77,19 +77,20 @@ export function getInputAsInt( } export function isCacheFeatureAvailable(): boolean { - if (!cache.isFeatureAvailable()) { - if (isGhes()) { - logWarning( - `Cache action is only supported on GHES version >= 3.5. If you are on version >=3.5 Please check with GHES admin if Actions cache service is enabled or not. + if (cache.isFeatureAvailable()) { + return true; + } + + if (isGhes()) { + logWarning( + `Cache action is only supported on GHES version >= 3.5. If you are on version >=3.5 Please check with GHES admin if Actions cache service is enabled or not. Otherwise please upgrade to GHES version >= 3.5 and If you are also using Github Connect, please unretire the actions/cache namespace before upgrade (see https://docs.github.com/en/enterprise-server@3.5/admin/github-actions/managing-access-to-actions-from-githubcom/enabling-automatic-access-to-githubcom-actions-using-github-connect#automatic-retirement-of-namespaces-for-actions-accessed-on-githubcom)` - ); - } else { - logWarning( - "An internal error has occurred in cache backend. Please check https://www.githubstatus.com/ for any ongoing issue in actions." - ); - } + ); return false; } - return true; + logWarning( + "An internal error has occurred in cache backend. Please check https://www.githubstatus.com/ for any ongoing issue in actions." + ); + return false; }