diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index da4c182ee..9a3aa93ba 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -26,7 +26,4 @@ jobs: - run: npm ci - run: npm run build - run: npm run format-check - - run: npm test - - name: Verify no unstaged changes - if: runner.os != 'windows' - run: __tests__/verify-no-unstaged-changes.sh + - run: npm test \ No newline at end of file diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml new file mode 100644 index 000000000..f03f47c48 --- /dev/null +++ b/.github/workflows/check-dist.yml @@ -0,0 +1,51 @@ +# `dist/index.js` is a special file in Actions. +# When you reference an action with `uses:` in a workflow, +# `index.js` is the code that will run. +# For our project, we generate this file through a build process from other source files. +# We need to make sure the checked-in `index.js` actually matches what we expect it to be. +name: Check dist/ + +on: + push: + branches: + - main + paths-ignore: + - '**.md' + pull_request: + paths-ignore: + - '**.md' + workflow_dispatch: + +jobs: + check-dist: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Set Node.js 12.x + uses: actions/setup-node@v1 + with: + node-version: 12.x + + - name: Install dependencies + run: npm ci + + - name: Rebuild the dist/ directory + run: npm run build + + - name: Compare the expected and actual dist/ directories + run: | + if [ "$(git diff --ignore-space-at-eol dist/ | wc -l)" -gt "0" ]; then + echo "Detected uncommitted changes after build. See status below:" + git diff + exit 1 + fi + id: diff + + # If index.js was different than expected, upload the expected version as an artifact + - uses: actions/upload-artifact@v2 + if: ${{ failure() && steps.diff.conclusion == 'failure' }} + with: + name: dist + path: dist/ diff --git a/.github/workflows/licensed.yml b/.github/workflows/licensed.yml index ae62613ff..4c1dfe5fb 100644 --- a/.github/workflows/licensed.yml +++ b/.github/workflows/licensed.yml @@ -1,8 +1,12 @@ name: Licensed on: - push: {branches: main} - pull_request: {branches: main} + push: + branches: + - main + pull_request: + branches: + - main jobs: test: @@ -17,4 +21,4 @@ jobs: curl -Lfs -o licensed.tar.gz https://github.com/github/licensed/releases/download/2.12.2/licensed-2.12.2-linux-x64.tar.gz sudo tar -xzf licensed.tar.gz sudo mv licensed /usr/local/bin/licensed - - run: licensed status \ No newline at end of file + - run: licensed status diff --git a/__tests__/cache-restore.test.ts b/__tests__/cache-restore.test.ts index 483f8eb6d..27f6fa27c 100644 --- a/__tests__/cache-restore.test.ts +++ b/__tests__/cache-restore.test.ts @@ -140,6 +140,7 @@ describe('cache-restore', () => { expect(infoSpy).not.toHaveBeenCalledWith( `${packageManager} cache is not found` ); + expect(setOutputSpy).toHaveBeenCalledWith('cache-hit', true); } ); }); @@ -167,6 +168,7 @@ describe('cache-restore', () => { expect(infoSpy).toHaveBeenCalledWith( `${packageManager} cache is not found` ); + expect(setOutputSpy).toHaveBeenCalledWith('cache-hit', false); } ); }); diff --git a/__tests__/verify-no-unstaged-changes.sh b/__tests__/verify-no-unstaged-changes.sh deleted file mode 100755 index f3260e3ba..000000000 --- a/__tests__/verify-no-unstaged-changes.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [[ "$(git status --porcelain)" != "" ]]; then - echo ---------------------------------------- - echo git status - echo ---------------------------------------- - git status - echo ---------------------------------------- - echo git diff - echo ---------------------------------------- - git diff - echo ---------------------------------------- - echo Troubleshooting - echo ---------------------------------------- - echo "::error::Unstaged changes detected. Locally try running: git clean -ffdx && npm ci && npm run pre-checkin" - exit 1 -fi diff --git a/action.yml b/action.yml index 66daef0cf..e50fa0e62 100644 --- a/action.yml +++ b/action.yml @@ -29,6 +29,9 @@ inputs: version: description: 'Deprecated. Use node-version instead. Will not be supported after October 1, 2019' deprecationMessage: 'The version property will not be supported after October 1, 2019. Use node-version instead' +outputs: + cache-hit: + description: 'A boolean value to indicate if a cache was hit' runs: using: 'node12' main: 'dist/setup/index.js' diff --git a/dist/setup/index.js b/dist/setup/index.js index d0f495dd9..e649b3583 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -44674,6 +44674,7 @@ exports.restoreCache = (packageManager, cacheDependencyPath) => __awaiter(void 0 core.debug(`primary key is ${primaryKey}`); core.saveState(constants_1.State.CachePrimaryKey, primaryKey); const cacheKey = yield cache.restoreCache([cachePath], primaryKey); + core.setOutput('cache-hit', Boolean(cacheKey)); if (!cacheKey) { core.info(`${packageManager} cache is not found`); return; diff --git a/src/cache-restore.ts b/src/cache-restore.ts index cd128cb15..d49b27fc5 100644 --- a/src/cache-restore.ts +++ b/src/cache-restore.ts @@ -42,6 +42,7 @@ export const restoreCache = async ( core.saveState(State.CachePrimaryKey, primaryKey); const cacheKey = await cache.restoreCache([cachePath], primaryKey); + core.setOutput('cache-hit', Boolean(cacheKey)); if (!cacheKey) { core.info(`${packageManager} cache is not found`);