From 3fa357ff5d582aee351657dbcb424ec65d30fc92 Mon Sep 17 00:00:00 2001 From: shinyoshiaki Date: Tue, 21 Jan 2020 16:55:06 +0900 Subject: [PATCH] rollback --- .github/workflows/deploy.yml | 50 ------------------------------------ README.en.md | 8 ++++-- README.md | 8 ++++-- README.zh_hans.md | 11 +++++--- package.json | 3 ++- 5 files changed, 21 insertions(+), 59 deletions(-) delete mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 9d527ba0..00000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: deploy - -on: - push: - branches: - - master - -jobs: - build: - runs-on: ubuntu-latest - if: github.actor != 'GitHubActions' - strategy: - matrix: - node-version: [12.x] - - steps: - - uses: actions/checkout@v1 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - name: Cache node modules - uses: actions/cache@v1 - with: - path: ~/.cache/yarn - key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - - name: prepare - run: | - yarn - - name: build - run: | - yarn build - - name: Commit files - run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHubActions" - git add --all - git commit --allow-empty -m "deploy" - - name: deploy - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: "master" - force: true - env: - CI: true \ No newline at end of file diff --git a/README.en.md b/README.en.md index bda61e55..107ca46e 100644 --- a/README.en.md +++ b/README.en.md @@ -82,9 +82,13 @@ yarn start yarn format ``` -### Build +### Things to do before pushing -ビルドは GithubActions 上で行われるので、ローカルで行う必要はありません。 +After editing the source code, please build before pushing. + +``` +yarn build +``` ### Testing diff --git a/README.md b/README.md index 3b182dca..b4f86f9a 100644 --- a/README.md +++ b/README.md @@ -79,9 +79,13 @@ yarn start yarn format ``` -### ビルド +### Push する前にすること -ビルドは GithubActions 上で行われるので、ローカルで行う必要はありません。 +ソースコードを編集した後、Push する前にビルドを行ってください + +``` +yarn build +``` ### テストコードを実行する diff --git a/README.zh_hans.md b/README.zh_hans.md index 12da0df3..c49c827b 100644 --- a/README.zh_hans.md +++ b/README.zh_hans.md @@ -72,6 +72,13 @@ npm run start # npm 托管在 http://localhost:8080 +编辑源代码时,请在 git push 之前进行构建: + +``` +For yarn build # yarn +npm run build # For npm +``` + ## 测试(Node.js) 您可以使用以下命令进行测试。 @@ -82,7 +89,3 @@ npm run test # For npm ``` `__tests__`和`preact`有测试用例。 - -### Build - -ビルドは GithubActions 上で行われるので、ローカルで行う必要はありません。 diff --git a/package.json b/package.json index 067aa1e2..8279a123 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,8 @@ }, "husky": { "hooks": { - "pre-commit": "pretty-quick --staged" + "pre-commit": "pretty-quick --staged", + "pre-push": "npm run build" } } }