Refactor devtool and CI

jjs-dev · May 21, 2020 · 2b0a3ac · 2b0a3ac
1 parent 8c0c39d
commit 2b0a3ac
Show file tree

Hide file tree

Showing 12 changed files with 358 additions and 312 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -1,5 +1,6 @@
-name: "deploy"
-on:
+---
+name: deploy
+"on":
   push:
     branches:
       - master
@@ -10,7 +11,7 @@ env:
 jobs:
   docker:
     name: docker
-    runs-on: 'ubuntu-18.04'
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
       - name: install global dependencies
@@ -20,16 +21,10 @@ jobs:
         env:
           JJS_DT_DEPLOY: docker
       - name: upload docker images
-        run: |
-          docker login --username jjs-dev --password ${{ secrets.GITHUB_TOKEN }} docker.pkg.github.com
-          docker login --username mikailbag --password ${{ secrets.DOCKER_HUB_TOKEN }}
-          docker tag jjs:latest mikailbag/jjs:latest
-          docker push mikailbag/jjs
-          docker tag jjs:latest docker.pkg.github.com/jjs-dev/jjs/jjs:master
-          docker push docker.pkg.github.com/jjs-dev/jjs/jjs:master
+        run: "docker login --username jjs-dev --password ${{ secrets.GITHUB_TOKEN }} docker.pkg.github.com\ndocker login --username mikailbag --password ${{ secrets.DOCKER_HUB_TOKEN }}\ndocker tag jjs:latest mikailbag/jjs:latest\ndocker push mikailbag/jjs\ndocker tag jjs:latest docker.pkg.github.com/jjs-dev/jjs/jjs:master\ndocker push docker.pkg.github.com/jjs-dev/jjs/jjs:master\n"
   deb:
     name: deb
-    runs-on: 'ubuntu-18.04'
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
       - name: Setup env
@@ -45,24 +40,20 @@ jobs:
           path: /opt/jjs/pkg/jjs.deb
   man:
     name: man
-    runs-on: 'ubuntu-18.04'
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
       - name: install global dependencies
-        run: |
-          bash scripts/ci-env.sh
-          cargo install mdbook --no-default-features
+        run: "bash scripts/ci-env.sh\ncargo install mdbook --no-default-features\n"
       - name: cargo jjs-build
         run: cargo jjs-build
         env:
           JJS_DT_DEPLOY: man
       - name: copy man
-        run: |
-          mkdir ./built-docs
-          cp -r /opt/jjs/share/docs/* ./built-docs
+        run: "mkdir ./built-docs\ncp -r /opt/jjs/share/docs/* ./built-docs\n"
       - name: upload man
         uses: peaceiris/actions-gh-pages@v2
         env:
-          ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+          ACTIONS_DEPLOY_KEY: "${{ secrets.ACTIONS_DEPLOY_KEY }}"
           PUBLISH_BRANCH: gh-pages
-          PUBLISH_DIR: ./built-docs
+          PUBLISH_DIR: "./built-docs"