daydream

commit 62af0be09015162ecdc641722623256a08254fc7
parent 4edb6b56956c1c60883a75d43aa96debee0f8b01
Author: MTRNord <mtrnord1@gmail.com>
Date:   Fri, 21 Aug 2020 21:30:33 +0200

feat: Use Github Pages

Diffstat:
M
.github/workflows/deploy.yml
 | 
17
+++--------------
M
.gitignore
 | 
4
++--
M
package-lock.json
 | 
9
+++++++++
M
package.json
 | 
7
+++++--

4 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,8 +1,8 @@
-name: Deploy to Netlify
+name: Deploy to Github pages
 
 on:
   push:
-    branches: [none]
+    branches: [main]
 
 jobs:
   deploy:
@@ -35,16 +35,5 @@ jobs:
       - name: Build
         run: source emsdk-master/emsdk_env.sh && cargo install cargo-make && cargo make dist
 
-      #- name: Publish
-      #  uses: netlify/actions/cli@master
-      #  with:
-      #    args: deploy --dir=dist --prod
-      #  env:
-      #    NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-      #    NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-
       - name: Publish
-        run: npx netlify-cli deploy --dir dist --site ${{ env.NETLIFY_SITE_ID }} --auth ${{ env.NETLIFY_AUTH_TOKEN }} --prod
-        env:
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+        run: npm run deploy
diff --git a/.gitignore b/.gitignore
@@ -5,5 +5,4 @@ dist/
 wasm-pack.log
 node_modules
 cypress/videos
-cypress/screenshots
-
+cypress/screenshots
+\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
@@ -1499,6 +1499,15 @@
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
+    "push-dir": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/push-dir/-/push-dir-0.4.1.tgz",
+      "integrity": "sha1-KUgerNnCEGu7eUHbbTfRIqBx7LQ=",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.0"
+      }
+    },
     "qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
diff --git a/package.json b/package.json
@@ -3,14 +3,16 @@
   "scripts": {
     "test": "start-server-and-test 'cargo install cargo-make && cargo make run' http-get://localhost:8000 cy:run:ci",
     "cy:open": "cypress open",
-    "cy:run:ci": "cypress run --browser chrome --record --key 99194b81-775d-4e98-9bac-8f2cc12bc62e --ci-build-id \"${GITHUB_SHA}-${GITHUB_WORKFLOW}-${GITHUB_EVENT_NAME}\" --group github-action-e2e --parallel"
+    "cy:run:ci": "cypress run --browser chrome --record --key 99194b81-775d-4e98-9bac-8f2cc12bc62e --ci-build-id \"${GITHUB_SHA}-${GITHUB_WORKFLOW}-${GITHUB_EVENT_NAME}\" --group github-action-e2e --parallel",
+    "deploy": "push-dir --dir=dist --branch=gh-pages --cleanup"
   },
   "devDependencies": {
     "cross-env": "^7.0.2",
     "cypress": "^4.9.0",
+    "push-dir": "^0.4.1",
     "start-server-and-test": "^1.11.0"
   },
   "dependencies": {
     "uikit": "^3.5.4"
   }
-}
+}
+\ No newline at end of file