From 99727c1fda182749bab4a6013811d9a9ed572ae8 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Wed, 8 Apr 2020 00:21:58 +0200 Subject: [PATCH] Remove absolute paths --- .github/CONTRIBUTING.md | 7 ++++--- .github/workflows/master.yml | 4 ++-- .github/workflows/release.yml | 5 ++--- .github/workflows/uncommited.yml | 4 ++-- node_modules/@actions/core/package.json | 9 +-------- node_modules/@actions/exec/package.json | 9 +-------- node_modules/@actions/io/package.json | 9 +-------- node_modules/at-least-node/package.json | 9 +-------- node_modules/fs-extra/package.json | 9 +-------- node_modules/graceful-fs/package.json | 9 +-------- node_modules/jsonfile/package.json | 9 +-------- node_modules/universalify/package.json | 9 +-------- package.json | 15 ++++++++------- 13 files changed, 26 insertions(+), 81 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e8d86a7..e00ae68 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -12,9 +12,10 @@ Contributions to this project are [released](https://help.github.com/articles/gi 5. Make your change 6. Compile your Typescript code: `npm run build` 7. Format your code: `npm run format` -8. Prune dependencies: `npm prune --production` -9. Push to your fork and [submit a pull request](https://github.com/crazy-max/ghaction-github-pages/compare) -10. Pat your self on the back and wait for your pull request to be reviewed and merged. +8. Install build dependencies: `npm run build-dep` +9. Prune dependencies: `npm run prune` +10. Push to your fork and [submit a pull request](https://github.com/crazy-max/ghaction-github-pages/compare) +11. Pat your self on the back and wait for your pull request to be reviewed and merged. Here are a few things you can do that will increase the likelihood of your pull request being accepted: diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 6403df9..d898315 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -28,8 +28,8 @@ jobs: - name: Prune prod run: | - rm -rf node_modules - npm install --production + npm run build-dep + npm run prune - name: Set up Git env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 15bf4a9..970e3c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,9 +48,8 @@ jobs: - name: NPM production deps run: | - rm -rf node_modules - sed -i '/node_modules/d' .gitignore - npm install --production + npm run build-dep + npm run prune - name: Commit and push changes run: | diff --git a/.github/workflows/uncommited.yml b/.github/workflows/uncommited.yml index b291552..1c5d213 100644 --- a/.github/workflows/uncommited.yml +++ b/.github/workflows/uncommited.yml @@ -25,8 +25,8 @@ jobs: - name: Prune prod run: | - rm -rf node_modules - npm install --production + npm run build-dep + npm run prune - name: Check for uncommitted changes run: | diff --git a/node_modules/@actions/core/package.json b/node_modules/@actions/core/package.json index 4af79a7..2030fd3 100644 --- a/node_modules/@actions/core/package.json +++ b/node_modules/@actions/core/package.json @@ -1,10 +1,4 @@ { - "_args": [ - [ - "@actions/core@1.2.3", - "/home/runner/work/ghaction-github-pages/ghaction-github-pages" - ] - ], "_from": "@actions/core@1.2.3", "_id": "@actions/core@1.2.3", "_inBundle": false, @@ -27,7 +21,6 @@ ], "_resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.3.tgz", "_spec": "1.2.3", - "_where": "/home/runner/work/ghaction-github-pages/ghaction-github-pages", "bugs": { "url": "https://github.com/actions/toolkit/issues" }, @@ -66,4 +59,4 @@ }, "types": "lib/core.d.ts", "version": "1.2.3" -} +} \ No newline at end of file diff --git a/node_modules/@actions/exec/package.json b/node_modules/@actions/exec/package.json index bc6f1e2..1d37c4c 100644 --- a/node_modules/@actions/exec/package.json +++ b/node_modules/@actions/exec/package.json @@ -1,10 +1,4 @@ { - "_args": [ - [ - "@actions/exec@1.0.3", - "/home/runner/work/ghaction-github-pages/ghaction-github-pages" - ] - ], "_from": "@actions/exec@1.0.3", "_id": "@actions/exec@1.0.3", "_inBundle": false, @@ -27,7 +21,6 @@ ], "_resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.0.3.tgz", "_spec": "1.0.3", - "_where": "/home/runner/work/ghaction-github-pages/ghaction-github-pages", "bugs": { "url": "https://github.com/actions/toolkit/issues" }, @@ -66,4 +59,4 @@ }, "types": "lib/exec.d.ts", "version": "1.0.3" -} +} \ No newline at end of file diff --git a/node_modules/@actions/io/package.json b/node_modules/@actions/io/package.json index bc6ba59..6a68cbc 100644 --- a/node_modules/@actions/io/package.json +++ b/node_modules/@actions/io/package.json @@ -1,10 +1,4 @@ { - "_args": [ - [ - "@actions/io@1.0.2", - "/home/runner/work/ghaction-github-pages/ghaction-github-pages" - ] - ], "_from": "@actions/io@1.0.2", "_id": "@actions/io@1.0.2", "_inBundle": false, @@ -28,7 +22,6 @@ ], "_resolved": "https://registry.npmjs.org/@actions/io/-/io-1.0.2.tgz", "_spec": "1.0.2", - "_where": "/home/runner/work/ghaction-github-pages/ghaction-github-pages", "bugs": { "url": "https://github.com/actions/toolkit/issues" }, @@ -64,4 +57,4 @@ }, "types": "lib/io.d.ts", "version": "1.0.2" -} +} \ No newline at end of file diff --git a/node_modules/at-least-node/package.json b/node_modules/at-least-node/package.json index c9ffcac..05a5ada 100644 --- a/node_modules/at-least-node/package.json +++ b/node_modules/at-least-node/package.json @@ -1,10 +1,4 @@ { - "_args": [ - [ - "at-least-node@1.0.0", - "/home/runner/work/ghaction-github-pages/ghaction-github-pages" - ] - ], "_from": "at-least-node@1.0.0", "_id": "at-least-node@1.0.0", "_inBundle": false, @@ -26,7 +20,6 @@ ], "_resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", "_spec": "1.0.0", - "_where": "/home/runner/work/ghaction-github-pages/ghaction-github-pages", "author": { "name": "Ryan Zimmerman", "email": "opensrc@ryanzim.com" @@ -60,4 +53,4 @@ "test": "ava" }, "version": "1.0.0" -} +} \ No newline at end of file diff --git a/node_modules/fs-extra/package.json b/node_modules/fs-extra/package.json index e462a13..ec4b678 100644 --- a/node_modules/fs-extra/package.json +++ b/node_modules/fs-extra/package.json @@ -1,10 +1,4 @@ { - "_args": [ - [ - "fs-extra@9.0.0", - "/home/runner/work/ghaction-github-pages/ghaction-github-pages" - ] - ], "_from": "fs-extra@9.0.0", "_id": "fs-extra@9.0.0", "_inBundle": false, @@ -26,7 +20,6 @@ ], "_resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz", "_spec": "9.0.0", - "_where": "/home/runner/work/ghaction-github-pages/ghaction-github-pages", "author": { "name": "JP Richardson", "email": "jprichardson@gmail.com" @@ -101,4 +94,4 @@ "unit": "node test.js" }, "version": "9.0.0" -} +} \ No newline at end of file diff --git a/node_modules/graceful-fs/package.json b/node_modules/graceful-fs/package.json index 5dbaa25..8f790ca 100644 --- a/node_modules/graceful-fs/package.json +++ b/node_modules/graceful-fs/package.json @@ -1,10 +1,4 @@ { - "_args": [ - [ - "graceful-fs@4.2.3", - "/home/runner/work/ghaction-github-pages/ghaction-github-pages" - ] - ], "_from": "graceful-fs@4.2.3", "_id": "graceful-fs@4.2.3", "_inBundle": false, @@ -27,7 +21,6 @@ ], "_resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", "_spec": "4.2.3", - "_where": "/home/runner/work/ghaction-github-pages/ghaction-github-pages", "bugs": { "url": "https://github.com/isaacs/node-graceful-fs/issues" }, @@ -80,4 +73,4 @@ "test": "node test.js | tap -" }, "version": "4.2.3" -} +} \ No newline at end of file diff --git a/node_modules/jsonfile/package.json b/node_modules/jsonfile/package.json index 34a930f..6b28c57 100644 --- a/node_modules/jsonfile/package.json +++ b/node_modules/jsonfile/package.json @@ -1,10 +1,4 @@ { - "_args": [ - [ - "jsonfile@6.0.1", - "/home/runner/work/ghaction-github-pages/ghaction-github-pages" - ] - ], "_from": "jsonfile@6.0.1", "_id": "jsonfile@6.0.1", "_inBundle": false, @@ -26,7 +20,6 @@ ], "_resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", "_spec": "6.0.1", - "_where": "/home/runner/work/ghaction-github-pages/ghaction-github-pages", "author": { "name": "JP Richardson", "email": "jprichardson@gmail.com" @@ -73,4 +66,4 @@ "unit": "mocha" }, "version": "6.0.1" -} +} \ No newline at end of file diff --git a/node_modules/universalify/package.json b/node_modules/universalify/package.json index 4fca805..d8f3aae 100644 --- a/node_modules/universalify/package.json +++ b/node_modules/universalify/package.json @@ -1,10 +1,4 @@ { - "_args": [ - [ - "universalify@1.0.0", - "/home/runner/work/ghaction-github-pages/ghaction-github-pages" - ] - ], "_from": "universalify@1.0.0", "_id": "universalify@1.0.0", "_inBundle": false, @@ -27,7 +21,6 @@ ], "_resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", "_spec": "1.0.0", - "_where": "/home/runner/work/ghaction-github-pages/ghaction-github-pages", "author": { "name": "Ryan Zimmerman", "email": "opensrc@ryanzim.com" @@ -65,4 +58,4 @@ "test": "standard && nyc tape test/*.js | colortape" }, "version": "1.0.0" -} +} \ No newline at end of file diff --git a/package.json b/package.json index f17bc61..3d9a4bd 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,6 @@ "directories": { "lib": "lib" }, - "scripts": { - "build": "tsc", - "format": "prettier --write **/*.ts", - "format-check": "prettier --check **/*.ts", - "prune": "npm prune --production" - }, "repository": { "type": "git", "url": "git+https://github.com/crazy-max/ghaction-docker-buildx.git" @@ -35,5 +29,12 @@ "prettier": "^2.0.4", "typescript": "^3.8.3", "typescript-formatter": "^7.2.2" + }, + "scripts": { + "build-dep": "npm install -g removeNPMAbsolutePaths", + "build": "tsc", + "format": "prettier --write **/*.ts", + "format-check": "prettier --check **/*.ts", + "prune": "npm prune --production && removeNPMAbsolutePaths \"./\" --force --fields _where _args" } -} +} \ No newline at end of file