Skip to content

Commit

Permalink
Merge pull request #561 from pelias/update-github-actions
Browse files Browse the repository at this point in the history
Update GitHub actions
  • Loading branch information
orangejulius authored Sep 23, 2021
2 parents b8d588c + 3e4ab3c commit 0ec1829
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 42 deletions.
12 changes: 0 additions & 12 deletions .circleci/config.yml

This file was deleted.

52 changes: 23 additions & 29 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ jobs:
matrix:
os:
- ubuntu-20.04
- macos-10.15
node-version:
- 10.x
- 12.x
- 14.x
- 16.x
steps:
- uses: actions/checkout@v2
- name: 'Install node.js ${{ matrix.node-version }}'
Expand All @@ -20,42 +20,36 @@ jobs:
- name: Run unit tests
run: |
npm install
npm run travis
functional-tests:
runs-on: '${{ matrix.os }}'
strategy:
matrix:
os:
- ubuntu-20.04
- macos-10.15
node-version:
- 10.x
- 12.x
steps:
- uses: actions/checkout@v2
- name: 'Install node.js ${{ matrix.node-version }}'
uses: actions/setup-node@v2-beta
with:
node-version: '${{ matrix.node-version }}'
- name: Run functional tests
run: |
npm install
npm run end-to-end
npm run ci
npm-publish:
needs: unit-tests
if: github.ref == 'refs/heads/master' && github.event_name == 'push'
runs-on: ubuntu-16.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Install node.js 12.x
- name: Install Node.js
uses: actions/setup-node@v2-beta
with:
node-version: 12.x
node-version: 16.x
- name: Run semantic-release
env:
GH_TOKEN: ${{ secrets.GH_SEMANTIC_RELEASE_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: >
curl
"https://raw.githubusercontent.com/pelias/ci-tools/master/semantic-release.sh"
| bash -
if [[ -n "$GH_TOKEN" && -n "$NPM_TOKEN" ]]; then
curl "https://raw.githubusercontent.com/pelias/ci-tools/master/semantic-release.sh" | bash -
fi
build-docker-images:
# run this job if the unit tests passed and the npm-publish job was a success or was skipped
# note: github actions won't run a job if you don't call one of the status check functions, so `always()` is called since it evalutes to `true`
if: ${{ always() && needs.unit-tests.result == 'success' && (needs.npm-publish.result == 'success' || needs.npm-publish.result == 'skipped') }}
needs: [unit-tests, npm-publish]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Build Docker images
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: |
curl "https://raw.githubusercontent.com/pelias/ci-tools/master/build-docker-images.sh" | bash -
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"lint": "jshint .",
"start": "./bin/start",
"test": "npm run units",
"travis": "node ./test/travis-config.js && npm test && npm run end-to-end",
"ci": "node ./test/ci-config.js && npm test && npm run end-to-end",
"units": "./bin/test",
"validate": "npm ls"
},
Expand Down
File renamed without changes.

0 comments on commit 0ec1829

Please sign in to comment.