From 097c1b4921153e4b43c6f7b2a504bea6e2ad8c47 Mon Sep 17 00:00:00 2001 From: yoyo837 Date: Wed, 4 Nov 2020 09:25:38 +0800 Subject: [PATCH 1/2] chore: use github action --- .github/workflows/main.yml | 113 +++++++++++++++++++++++++++++++++++++ .gitignore | 1 + .travis.yml | 17 ------ README.md | 6 +- 4 files changed, 117 insertions(+), 20 deletions(-) create mode 100644 .github/workflows/main.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..f188b50 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,113 @@ +name: CI + +on: + push: + branches: [master] + pull_request: + branches: [master] + +jobs: + setup: + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@master + + - uses: actions/setup-node@v1 + with: + node-version: '12' + + - name: cache package-lock.json + uses: actions/cache@v1 + with: + path: package-temp-dir + key: lock-${{ github.sha }} + + - name: create package-lock.json + run: npm i --package-lock-only + + - name: hack for singe file + run: | + if [ ! -d "package-temp-dir" ]; then + mkdir package-temp-dir + fi + cp package-lock.json package-temp-dir + - name: cache node_modules + id: node_modules_cache_id + uses: actions/cache@v1 + with: + path: node_modules + key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} + + - name: install + if: steps.node_modules_cache_id.outputs.cache-hit != 'true' + run: npm ci + + lint: + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@master + + - name: restore cache from package-lock.json + uses: actions/cache@v1 + with: + path: package-temp-dir + key: lock-${{ github.sha }} + + - name: restore cache from node_modules + uses: actions/cache@v1 + with: + path: node_modules + key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} + + - name: lint + run: npm run lint + + needs: setup + + compile: + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@master + + - name: restore cache from package-lock.json + uses: actions/cache@v1 + with: + path: package-temp-dir + key: lock-${{ github.sha }} + + - name: restore cache from node_modules + uses: actions/cache@v1 + with: + path: node_modules + key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} + + - name: compile + run: npm run compile + + needs: setup + + coverage: + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@master + + - name: restore cache from package-lock.json + uses: actions/cache@v1 + with: + path: package-temp-dir + key: lock-${{ github.sha }} + + - name: restore cache from node_modules + uses: actions/cache@v1 + with: + path: node_modules + key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} + + - name: coverage + run: npm test -- --coverage && bash <(curl -s https://codecov.io/bash) + + needs: setup \ No newline at end of file diff --git a/.gitignore b/.gitignore index f28aa39..36d90d8 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,5 @@ build lib es coverage +package-lock.json yarn.lock diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 38bbfe1..0000000 --- a/.travis.yml +++ /dev/null @@ -1,17 +0,0 @@ -language: node_js - -node_js: - - 10 - -script: -- | - if [ "$TEST_TYPE" = test ]; then - npm run coverage && \ - bash <(curl -s https://codecov.io/bash) - else - npm run $TEST_TYPE - fi -env: - matrix: - - TEST_TYPE=lint - - TEST_TYPE=test \ No newline at end of file diff --git a/README.md b/README.md index 334a0e4..1c45958 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ React Align Component. Wrapper around https://github.com/yiminghe/dom-align. [![NPM version][npm-image]][npm-url] -[![build status][travis-image]][travis-url] +[![build status][github-actions-image]][github-actions-url] [![Codecov][codecov-image]][codecov-url] [![gemnasium deps][gemnasium-image]][gemnasium-url] [![node version][node-image]][node-url] @@ -12,8 +12,8 @@ React Align Component. Wrapper around https://github.com/yiminghe/dom-align. [npm-image]: http://img.shields.io/npm/v/rc-align.svg?style=flat-square [npm-url]: http://npmjs.org/package/rc-align -[travis-image]: https://img.shields.io/travis/react-component/align.svg?style=flat-square -[travis-url]: https://travis-ci.org/react-component/align +[github-actions-image]: https://github.com/react-component/align/workflows/CI/badge.svg +[github-actions-url]: https://github.com/react-component/align/actions [codecov-image]: https://img.shields.io/codecov/c/github/react-component/align/master.svg?style=flat-square [codecov-url]: https://codecov.io/gh/react-component/align/branch/master [gemnasium-image]: http://img.shields.io/gemnasium/react-component/align.svg?style=flat-square From bd3586cf9e4c0523bbadaa020b17b12bf0ef3cf8 Mon Sep 17 00:00:00 2001 From: yoyo837 Date: Wed, 4 Nov 2020 09:29:34 +0800 Subject: [PATCH 2/2] cache@v2 --- .github/workflows/main.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f188b50..e4edf95 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: node-version: '12' - name: cache package-lock.json - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: package-temp-dir key: lock-${{ github.sha }} @@ -34,7 +34,7 @@ jobs: cp package-lock.json package-temp-dir - name: cache node_modules id: node_modules_cache_id - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: node_modules key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} @@ -50,13 +50,13 @@ jobs: uses: actions/checkout@master - name: restore cache from package-lock.json - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: package-temp-dir key: lock-${{ github.sha }} - name: restore cache from node_modules - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: node_modules key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} @@ -73,13 +73,13 @@ jobs: uses: actions/checkout@master - name: restore cache from package-lock.json - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: package-temp-dir key: lock-${{ github.sha }} - name: restore cache from node_modules - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: node_modules key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} @@ -96,13 +96,13 @@ jobs: uses: actions/checkout@master - name: restore cache from package-lock.json - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: package-temp-dir key: lock-${{ github.sha }} - name: restore cache from node_modules - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: node_modules key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}