27.diff (2986B)
1 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml 2 index 5d16852..f5f8911 100644 3 --- a/.github/workflows/deploy.yml 4 +++ b/.github/workflows/deploy.yml 5 @@ -1,8 +1,8 @@ 6 -name: Deploy to Netlify 7 +name: Deploy to Github pages 8 9 on: 10 push: 11 - branches: [none] 12 + branches: [main] 13 14 jobs: 15 deploy: 16 @@ -35,16 +35,5 @@ jobs: 17 - name: Build 18 run: source emsdk-master/emsdk_env.sh && cargo install cargo-make && cargo make dist 19 20 - #- name: Publish 21 - # uses: netlify/actions/cli@master 22 - # with: 23 - # args: deploy --dir=dist --prod 24 - # env: 25 - # NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }} 26 - # NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} 27 - 28 - name: Publish 29 - run: npx netlify-cli deploy --dir dist --site ${{ env.NETLIFY_SITE_ID }} --auth ${{ env.NETLIFY_AUTH_TOKEN }} --prod 30 - env: 31 - NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }} 32 - NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} 33 + run: npm run deploy 34 diff --git a/.gitignore b/.gitignore 35 index d997b3c..ccd3105 100644 36 --- a/.gitignore 37 +++ b/.gitignore 38 @@ -5,5 +5,4 @@ dist/ 39 wasm-pack.log 40 node_modules 41 cypress/videos 42 -cypress/screenshots 43 - 44 +cypress/screenshots 45 \ No newline at end of file 46 diff --git a/package-lock.json b/package-lock.json 47 index bda3238..5504282 100644 48 --- a/package-lock.json 49 +++ b/package-lock.json 50 @@ -1499,6 +1499,15 @@ 51 "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", 52 "dev": true 53 }, 54 + "push-dir": { 55 + "version": "0.4.1", 56 + "resolved": "https://registry.npmjs.org/push-dir/-/push-dir-0.4.1.tgz", 57 + "integrity": "sha1-KUgerNnCEGu7eUHbbTfRIqBx7LQ=", 58 + "dev": true, 59 + "requires": { 60 + "minimist": "^1.2.0" 61 + } 62 + }, 63 "qs": { 64 "version": "6.5.2", 65 "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", 66 diff --git a/package.json b/package.json 67 index 13b3936..864725f 100644 68 --- a/package.json 69 +++ b/package.json 70 @@ -3,14 +3,16 @@ 71 "scripts": { 72 "test": "start-server-and-test 'cargo install cargo-make && cargo make run' http-get://localhost:8000 cy:run:ci", 73 "cy:open": "cypress open", 74 - "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" 75 + "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", 76 + "deploy": "push-dir --dir=dist --branch=gh-pages --cleanup" 77 }, 78 "devDependencies": { 79 "cross-env": "^7.0.2", 80 "cypress": "^4.9.0", 81 + "push-dir": "^0.4.1", 82 "start-server-and-test": "^1.11.0" 83 }, 84 "dependencies": { 85 "uikit": "^3.5.4" 86 } 87 -} 88 +} 89 \ No newline at end of file