From 6bbe742add91b3db4abf110e742a967ec789958f Mon Sep 17 00:00:00 2001 From: Brian Cristante <33549821+brcrista@users.noreply.github.com> Date: Mon, 9 Aug 2021 09:10:47 -0400 Subject: [PATCH] Use existing check-dist implementation (#618) --- .github/workflows/check-dist.yml | 14 ++++++++------ .github/workflows/workflow.yml | 11 ----------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml index a19cd7a..16c2117 100644 --- a/.github/workflows/check-dist.yml +++ b/.github/workflows/check-dist.yml @@ -32,14 +32,16 @@ jobs: - name: Install dependencies run: npm ci - - name: Move the committed index.js file - run: mv dist/ /tmp/ - - - name: Rebuild the index.js file + - name: Rebuild the dist/ directory run: npm run build - - name: Compare the expected and actual index.js files - run: git diff --ignore-all-space dist/ /tmp/dist + - 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 diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 460d7dd..a5dd3b7 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -47,17 +47,6 @@ jobs: run: npm run lint - name: Build & Test run: npm run test - - name: Ensure dist/ folder is up-to-date - if: ${{ runner.os == 'Linux' }} - shell: bash - run: | - npm run build - if [ "$(git diff --ignore-space-at-eol | wc -l)" -gt "0" ]; then - echo "Detected uncommitted changes after build. See status below:" - git diff - exit 1 - fi - # End to end save and restore test-save: