pelias-schema 6.5.0 → 6.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,30 @@
1
+ name: Integration Tests
2
+ on: workflow_call
3
+ jobs:
4
+ integration-tests:
5
+ runs-on: ${{ matrix.os }}
6
+ strategy:
7
+ matrix:
8
+ os:
9
+ - ${{ vars.UBUNTU_VERSION }}
10
+ node-version: [14.x, 16.x]
11
+ es-version: [7.6.1]
12
+ jdk-version: [oraclejdk11]
13
+ steps:
14
+ - uses: actions/checkout@v2
15
+ - name: Install node.js ${{ matrix.node-version }}
16
+ uses: actions/setup-node@v2-beta
17
+ with:
18
+ node-version: ${{ matrix.node-version }}
19
+ - name: Start elasticsearch ${{ matrix.es-version }} (${{ matrix.jdk-version }})
20
+ env:
21
+ ES_VERSION: ${{ matrix.es-version }}
22
+ JDK_VERSION: ${{ matrix.jdk-version }}
23
+ run: ./scripts/setup_ci.sh
24
+ - name: Run integration tests
25
+ run: |
26
+ npm install -g npm
27
+ npm install
28
+ curl http://127.0.0.1:9200/
29
+ ./bin/create_index
30
+ npm run integration
@@ -0,0 +1,21 @@
1
+ name: Unit Tests
2
+ on: workflow_call
3
+ jobs:
4
+ unit-tests:
5
+ runs-on: ${{ matrix.os }}
6
+ strategy:
7
+ matrix:
8
+ os:
9
+ - ${{ vars.UBUNTU_VERSION }}
10
+ node-version: [14.x, 16.x]
11
+ steps:
12
+ - uses: actions/checkout@v2
13
+ - name: Install node.js ${{ matrix.node-version }}
14
+ uses: actions/setup-node@v2-beta
15
+ with:
16
+ node-version: ${{ matrix.node-version }}
17
+ - name: Run unit tests
18
+ run: |
19
+ npm install -g npm
20
+ npm install
21
+ npm run test
@@ -0,0 +1,11 @@
1
+ name: Continuous Integration
2
+ on: pull_request
3
+ jobs:
4
+ unit-tests:
5
+ # only run this job for forks
6
+ if: github.event.pull_request.head.repo.full_name != github.repository
7
+ uses: ./.github/workflows/_unit_tests.yml
8
+ integration-tests:
9
+ # only run this job for forks
10
+ if: github.event.pull_request.head.repo.full_name != github.repository
11
+ uses: ./.github/workflows/_integration_tests.yml
@@ -5,53 +5,13 @@ on:
5
5
  - 'v[0-9]+.[0-9]+.[0-9]+'
6
6
  jobs:
7
7
  unit-tests:
8
- runs-on: ${{ matrix.os }}
9
- strategy:
10
- matrix:
11
- os: [ubuntu-20.04]
12
- node-version: [14.x, 16.x]
13
- steps:
14
- - uses: actions/checkout@v2
15
- - name: Install node.js ${{ matrix.node-version }}
16
- uses: actions/setup-node@v2-beta
17
- with:
18
- node-version: ${{ matrix.node-version }}
19
- - name: Run unit tests
20
- run: |
21
- npm install -g npm
22
- npm install
23
- npm run test
8
+ uses: ./.github/workflows/_unit_tests.yml
24
9
  integration-tests:
25
- needs: unit-tests
26
- runs-on: ${{ matrix.os }}
27
- strategy:
28
- matrix:
29
- os: [ubuntu-20.04]
30
- node-version: [14.x, 16.x]
31
- es-version: [7.6.1]
32
- jdk-version: [oraclejdk11]
33
- steps:
34
- - uses: actions/checkout@v2
35
- - name: Install node.js ${{ matrix.node-version }}
36
- uses: actions/setup-node@v2-beta
37
- with:
38
- node-version: ${{ matrix.node-version }}
39
- - name: Start elasticsearch ${{ matrix.es-version }} (${{ matrix.jdk-version }})
40
- env:
41
- ES_VERSION: ${{ matrix.es-version }}
42
- JDK_VERSION: ${{ matrix.jdk-version }}
43
- run: ./scripts/setup_ci.sh
44
- - name: Run integration tests
45
- run: |
46
- npm install -g npm
47
- npm install
48
- curl http://127.0.0.1:9200/
49
- ./bin/create_index
50
- npm run integration
10
+ uses: ./.github/workflows/_integration_tests.yml
51
11
  npm-publish:
52
12
  needs: [unit-tests, integration-tests]
53
13
  if: github.ref == 'refs/heads/master' && github.event_name == 'push'
54
- runs-on: ubuntu-20.04
14
+ runs-on: ${{ vars.UBUNTU_VERSION }}
55
15
  steps:
56
16
  - uses: actions/checkout@v2
57
17
  - name: Install Node.js
@@ -69,7 +29,7 @@ jobs:
69
29
  # 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`
70
30
  if: ${{ always() && needs.unit-tests.result == 'success' && (needs.npm-publish.result == 'success' || needs.npm-publish.result == 'skipped') }}
71
31
  needs: [unit-tests, integration-tests, npm-publish]
72
- runs-on: ubuntu-20.04
32
+ runs-on: ${{ vars.UBUNTU_VERSION }}
73
33
  steps:
74
34
  - uses: actions/checkout@v2
75
35
  - name: Build Docker images
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pelias-schema",
3
- "version": "6.5.0",
3
+ "version": "6.6.0",
4
4
  "author": "pelias",
5
5
  "description": "Elasticsearch schema files and tooling for Pelias",
6
6
  "homepage": "https://github.com/pelias/schema",