cleanup and cache

MichaelSp · May 4, 2022 · 48b1eb1 · 48b1eb1
1 parent 58fbe63
commit 48b1eb1
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 245 deletions.
diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml
@@ -22,23 +22,28 @@ jobs:
         uses: actions/setup-node@v3.1.1
         with:
           node-version: 16.x
+          cache: 'npm'
 
       - name: Install dependencies
-        run: npm ci
-
+        run: |
+          npm ci
+          sudo apt-get update && sudo apt-get install dos2unix
+      - name: test
+        run: npm run test
       - name: Rebuild the dist/ directory
         run: |
           npm run build
           npm run package
 
       - name: Compare the expected and actual dist/ directories
+        id: diff
         run: |
-          if [ "$(git diff --ignore-space-at-eol dist/ | wc -l)" -gt "0" ]; then
+          git status --porcelain=v1
+          if [ "$(git status --porcelain=v1 2>/dev/null | wc -l | sed 's# ##g')" -gt "0" ]; then
             echo "Detected uncommitted changes after build.  See status below:"
-            git diff
+            git diff --text
             exit 1
           fi
-        id: diff
 
       # If index.js was different than expected, upload the expected version as an artifact
       - uses: actions/upload-artifact@v3

diff --git a/dist/estimate.js b/dist/estimate.js
diff --git a/dist/estimate.test.js b/dist/estimate.test.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/main.js b/dist/main.js
diff --git a/dist/types.js b/dist/types.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "typescript-action",
-  "version": "0.0.0",
+  "name": "jira-estimates",
+  "version": "v1",
   "private": true,
   "description": "TypeScript template action",
   "main": "lib/main.js",
@@ -9,7 +9,7 @@
     "format": "prettier --write '**/*.ts'",
     "format-check": "prettier --check '**/*.ts'",
     "lint": "eslint src/**/*.ts",
-    "package": "ncc build --source-map --license licenses.txt",
+    "package": "ncc build --source-map --license licenses.txt && dos2unix dist/*",
     "test": "jest",
     "all": "npm run build && npm run format && npm run lint && npm run package && npm test"
   },

diff --git a/tsconfig.json b/tsconfig.json
@@ -7,5 +7,6 @@
     "strict": true,                           /* Enable all strict type-checking options. */
     "noImplicitAny": true,                    /* Raise error on expressions and declarations with an implied 'any' type. */
     "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-  }
+  },
+  "exclude": ["**/*.test.ts"]
 }