From 169da90376598a774a1eb6f9aac78f5d2ba8f0a9 Mon Sep 17 00:00:00 2001 From: Josh Gross Date: Fri, 12 Apr 2024 15:01:43 -0400 Subject: [PATCH] Remove Docker and fix Pages site (#78) --- .github/workflows/deploy.yml | 26 +++++++++++---- .gitignore | 3 +- Dockerfile | 11 ------- action.yml | 14 -------- package-lock.json | 63 +++++++++++++++++++++++++----------- run.sh | 1 - 6 files changed, 65 insertions(+), 53 deletions(-) delete mode 100644 Dockerfile delete mode 100644 action.yml delete mode 100644 run.sh diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 21bce3a..9ad777a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -25,17 +25,29 @@ jobs: build: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Setup Pages + - uses: actions/checkout@v4 + + - name: Set up Pages uses: actions/configure-pages@v5 - - name: Build with Jekyll - uses: actions/jekyll-build-pages@v1 + + - uses: actions/setup-node@v4 with: - source: ./ - destination: ./_site + node-version: "20" + + - name: Install dependencies + run: npm i --production + + - name: Build Site + run: | + mkdir ./_site + cp favicon.ico ./_site + touch ./_site/.nojekyll + node action.js html ./_site/index.html + - name: Upload artifact uses: actions/upload-pages-artifact@v3 + with: + path: "./_site" # Deployment job deploy: diff --git a/.gitignore b/.gitignore index b512c09..5a87346 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -node_modules \ No newline at end of file +node_modules +_site \ No newline at end of file diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index eac45d9..0000000 --- a/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM node:12 - -WORKDIR /opt/humans.txt - -COPY . /opt/humans.txt - -RUN npm i --production - -ENV FORCE_COLOR=3 - -ENTRYPOINT ["bash", "/opt/humans.txt/run.sh"] diff --git a/action.yml b/action.yml deleted file mode 100644 index 1711ef7..0000000 --- a/action.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: 'GitHub Actions humans.txt' -description: 'List out the humans who help feed and tend the robots of GitHub Actions' -inputs: - format: - description: 'How to output the people of actions - txt, json, html or ascii' - default: 'ascii' - output: - description: 'Where to output the file - stdout otherwise' -runs: - using: 'docker' - image: 'Dockerfile' - args: - - "${{ inputs.format }}" - - "${{ inputs.output }}" diff --git a/package-lock.json b/package-lock.json index 62d2acb..81fb9c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,75 +1,100 @@ { + "name": "humans.txt", + "lockfileVersion": 3, "requires": true, - "lockfileVersion": 1, - "dependencies": { - "@babel/runtime": { + "packages": { + "": { + "dependencies": { + "chalk": "3.0.0", + "yaml": "1.7.2" + } + }, + "node_modules/@babel/runtime": { "version": "7.7.7", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.7.tgz", "integrity": "sha512-uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA==", - "requires": { + "dependencies": { "regenerator-runtime": "^0.13.2" } }, - "@types/color-name": { + "node_modules/@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" }, - "ansi-styles": { + "node_modules/ansi-styles": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.0.tgz", "integrity": "sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg==", - "requires": { + "dependencies": { "@types/color-name": "^1.1.1", "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" } }, - "chalk": { + "node_modules/chalk": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "requires": { + "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" } }, - "color-convert": { + "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { + "dependencies": { "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" } }, - "color-name": { + "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "has-flag": { + "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } }, - "regenerator-runtime": { + "node_modules/regenerator-runtime": { "version": "0.13.3", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==" }, - "supports-color": { + "node_modules/supports-color": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "requires": { + "dependencies": { "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, - "yaml": { + "node_modules/yaml": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.7.2.tgz", "integrity": "sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw==", - "requires": { + "dependencies": { "@babel/runtime": "^7.6.3" + }, + "engines": { + "node": ">= 6" } } } diff --git a/run.sh b/run.sh deleted file mode 100644 index 573c466..0000000 --- a/run.sh +++ /dev/null @@ -1 +0,0 @@ -node /opt/humans.txt/action.js $@ \ No newline at end of file