From 8625165d24fd66d87e34c5c0e69b3d8cef2f64f3 Mon Sep 17 00:00:00 2001 From: Nick Evans <2616208+nickevansuk@users.noreply.github.com> Date: Fri, 24 Mar 2023 20:20:56 +0000 Subject: [PATCH 01/16] feat: Make getExamplesWithContent more comprehensive (#108) --- src/getExamplesWithContent-spec.js | 21 ++++++++++++++++++--- src/getExamplesWithContent.js | 27 +++++++++++++++++++-------- 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/src/getExamplesWithContent-spec.js b/src/getExamplesWithContent-spec.js index c596b521..816f4946 100644 --- a/src/getExamplesWithContent-spec.js +++ b/src/getExamplesWithContent-spec.js @@ -2,18 +2,33 @@ const getExamplesWithContent = require('./getExamplesWithContent'); describe('getExamplesWithContent', () => { it('should throw if passed an invalid spec version', async () => { - expectAsync(getExamplesWithContent('0.0')).toBeRejected(); + expect(() => getExamplesWithContent('0.0')).toThrow(); }); it('should return valid examples as JSON', async () => { - const examples = await getExamplesWithContent('2.0'); + const examples = getExamplesWithContent('2.0'); expect(typeof examples).toBe('object'); expect(examples instanceof Array).toBe(true); }); it('should return valid examples as JSON with a version alias', async () => { - const examples = await getExamplesWithContent('latest'); + const examples = getExamplesWithContent('latest'); expect(typeof examples).toBe('object'); expect(examples instanceof Array).toBe(true); }); + + it('should use remote fetcher for remote examples', async () => { + const mockFetcher = x => `Fetcher:${x}`; + + const examples = getExamplesWithContent('latest', mockFetcher); + expect(typeof examples).toBe('object'); + expect(examples instanceof Array).toBe(true); + + const remoteExamples = examples.filter(x => x.file.indexOf('http') === 0); + expect(remoteExamples).toBeNonEmptyArray(); + + for (const { file, data } of remoteExamples) { + expect(data).toBe(mockFetcher(file)); + } + }); }); diff --git a/src/getExamplesWithContent.js b/src/getExamplesWithContent.js index f018a0b9..9c2538bb 100644 --- a/src/getExamplesWithContent.js +++ b/src/getExamplesWithContent.js @@ -1,19 +1,30 @@ -const fs = require('fs').promises; +const fs = require('fs'); const getExamples = require('./getExamples'); const EXAMPLES_DIRECTORY = `${__dirname}/../versions/2.x/examples/`; +const EXAMPLES_BASE_URL = 'https://openactive.io/data-models/versions/2.x/examples/'; -const getExamplesWithContent = async (version) => { + +const getExamplesWithContent = (version, fetcherForRemoteExamplesSync) => { const examples = getExamples(version); + const flattenedExamples = examples.flatMap(x => x.exampleList.map(example => ({ category: x.name, ...example }))); const output = []; - for (const { file, name } of examples.flatMap(x => x.exampleList)) { - // Only include local examples - if (file.indexOf('http') !== 0) { - const data = JSON.parse(await fs.readFile(`${EXAMPLES_DIRECTORY}${file}`, { encoding: 'utf8' })); + for (const example of flattenedExamples) { + if (example.file.indexOf('http') !== 0) { + // Local example file + const data = JSON.parse(fs.readFileSync(`${EXAMPLES_DIRECTORY}${example.file}`, { encoding: 'utf8' })); + output.push({ + data, + url: `${EXAMPLES_BASE_URL}${example.file}`, + ...example, + }); + } else if (fetcherForRemoteExamplesSync) { + // Remote example file + const data = fetcherForRemoteExamplesSync(`${example.file}`); output.push({ - name, - file, data, + url: example.file, + ...example, }); } } From 5f198b303a416b3ff3fecabdd8ff08ceb185072e Mon Sep 17 00:00:00 2001 From: OpenActive Date: Fri, 24 Mar 2023 20:21:36 +0000 Subject: [PATCH 02/16] 2.0.296 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8b7461f6..8df6e068 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.295", + "version": "2.0.296", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 078f5a2e..43acc330 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.295", + "version": "2.0.296", "description": "Data models used to drive that OpenActive validator, developer documentation, and model libraries", "homepage": "https://www.openactive.io", "author": "OpenActive Community ", From d046778b54ff2db80151311229767564e48f6b78 Mon Sep 17 00:00:00 2001 From: Nick Evans <2616208+nickevansuk@users.noreply.github.com> Date: Fri, 24 Mar 2023 20:42:33 +0000 Subject: [PATCH 03/16] chore: Automatically test data-model-validator with latest data-models (#109) --- .github/workflows/validator-test.yml | 39 ++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/validator-test.yml diff --git a/.github/workflows/validator-test.yml b/.github/workflows/validator-test.yml new file mode 100644 index 00000000..f3f9634a --- /dev/null +++ b/.github/workflows/validator-test.yml @@ -0,0 +1,39 @@ +name: Test validator + +on: + pull_request: + branches: [ master ] + +jobs: + test-validator: + runs-on: ubuntu-latest + steps: + - name: Checkout data-models + uses: actions/checkout@v2 + with: + path: data-models + - name: Checkout data-model-validator + uses: actions/checkout@v2 + with: + path: data-model-validator + repository: openactive/data-model-validator + + - name: Use Node.js 14.x + uses: actions/setup-node@v1 + with: + node-version: 14 + + - name: Install data-models + run: npm install + working-directory: data-models + - name: Install data-model-validator + run: npm install + working-directory: data-model-validator + + - name: Update data-model-validator to reference local data-models + run: npm install file:../data-models + working-directory: data-model-validator + + - name: Test + run: npm test + working-directory: data-model-validator From 80cd2a14368d43f3abdab73e6d8f9014a5fa7886 Mon Sep 17 00:00:00 2001 From: OpenActive Date: Fri, 24 Mar 2023 20:43:13 +0000 Subject: [PATCH 04/16] 2.0.297 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8df6e068..0a372bdb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.296", + "version": "2.0.297", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 43acc330..d11b562b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.296", + "version": "2.0.297", "description": "Data models used to drive that OpenActive validator, developer documentation, and model libraries", "homepage": "https://www.openactive.io", "author": "OpenActive Community ", From 588e178d9538061e34685b3aea9e96cca31c8973 Mon Sep 17 00:00:00 2001 From: Nick Evans <2616208+nickevansuk@users.noreply.github.com> Date: Fri, 24 Mar 2023 20:52:18 +0000 Subject: [PATCH 05/16] feat: Improve dataset site model validation specificity (#110) --- versions/2.x/models/BookingService.json | 18 +++++++++- versions/2.x/models/Dataset.json | 47 ++++++++++++++----------- versions/2.x/models/WebAPI.json | 31 +++++++++------- 3 files changed, 63 insertions(+), 33 deletions(-) diff --git a/versions/2.x/models/BookingService.json b/versions/2.x/models/BookingService.json index d91f1f58..ab384f9b 100644 --- a/versions/2.x/models/BookingService.json +++ b/versions/2.x/models/BookingService.json @@ -15,7 +15,8 @@ "BResponse": "response", "BResponseOrderItemError": "response", "OrderProposalPatch": "request", - "OrderPatch": "request" + "OrderPatch": "request", + "DatasetSite": "datasetSite" }, "imperativeConfiguration": { "request": { @@ -28,6 +29,21 @@ "name" ], "recommendedFields": [] + }, + "datasetSite": { + "requiredOptions": [ + { + "description": [ + "A `BookingService` must include a `name`, unless it is an bespoke build, in which case `hasCredential` may be included as the only property." + ], + "options": [ + "name", + "hasCredential" + ] + } + ], + "requiredFields": [], + "recommendedFields": [] } }, "inSpec": [ diff --git a/versions/2.x/models/Dataset.json b/versions/2.x/models/Dataset.json index 026ef56c..aba1df87 100644 --- a/versions/2.x/models/Dataset.json +++ b/versions/2.x/models/Dataset.json @@ -3,26 +3,33 @@ "derivedFrom": "https://schema.org/Dataset", "hasId": true, "sampleId": "https://opendata.fusion-lifestyle.com/OpenActive/", - "requiredFields": [ - "id", - "type", - "url", - "name", - "description", - "keywords", - "license", - "distribution", - "discussionUrl", - "documentation", - "inLanguage", - "publisher", - "schemaVersion" - ], - "recommendedFields": [ - "datePublished", - "dateModified", - "backgroundImage" - ], + "validationMode": { + "DatasetSite": "datasetSite" + }, + "imperativeConfiguration": { + "datasetSite": { + "requiredFields": [ + "id", + "type", + "url", + "name", + "description", + "keywords", + "license", + "distribution", + "discussionUrl", + "documentation", + "inLanguage", + "publisher", + "schemaVersion" + ], + "recommendedFields": [ + "datePublished", + "dateModified", + "backgroundImage" + ] + } + }, "inSpec": [ "id", "type", diff --git a/versions/2.x/models/WebAPI.json b/versions/2.x/models/WebAPI.json index 5eeb31aa..57e8dffa 100644 --- a/versions/2.x/models/WebAPI.json +++ b/versions/2.x/models/WebAPI.json @@ -2,18 +2,25 @@ "type": "WebAPI", "derivedFrom": "https://pending.schema.org/WebAPI", "hasId": false, - "requiredFields": [ - "type", - "name", - "endpointUrl", - "conformsTo", - "endpointDescription", - "landingPage" - ], - "recommendedFields": [ - "documentation", - "termsOfService" - ], + "validationMode": { + "DatasetSite": "datasetSite" + }, + "imperativeConfiguration": { + "datasetSite": { + "requiredFields": [ + "type", + "name", + "endpointUrl", + "conformsTo", + "endpointDescription", + "landingPage" + ], + "recommendedFields": [ + "documentation", + "termsOfService" + ] + } + }, "inSpec": [ "type", "name", From 50e916011fbf0969c5215a71bc93a7ac9eff7578 Mon Sep 17 00:00:00 2001 From: OpenActive Date: Fri, 24 Mar 2023 20:53:12 +0000 Subject: [PATCH 06/16] 2.0.298 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0a372bdb..11d40240 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.297", + "version": "2.0.298", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index d11b562b..0345ad35 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.297", + "version": "2.0.298", "description": "Data models used to drive that OpenActive validator, developer documentation, and model libraries", "homepage": "https://www.openactive.io", "author": "OpenActive Community ", From 00890993196d28ab1e80d362653b7d36b9ac0e08 Mon Sep 17 00:00:00 2001 From: nickevansuk <2616208+nickevansuk@users.noreply.github.com> Date: Fri, 24 Mar 2023 21:07:14 +0000 Subject: [PATCH 07/16] fix: Description typo --- versions/2.x/models/BookingService.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/2.x/models/BookingService.json b/versions/2.x/models/BookingService.json index ab384f9b..05113ce9 100644 --- a/versions/2.x/models/BookingService.json +++ b/versions/2.x/models/BookingService.json @@ -34,7 +34,7 @@ "requiredOptions": [ { "description": [ - "A `BookingService` must include a `name`, unless it is an bespoke build, in which case `hasCredential` may be included as the only property." + "A `BookingService` must include a `name`, unless it is a bespoke build, in which case only `hasCredential` is required." ], "options": [ "name", From fe5675ad5ac8acbefd722c587e4d3f2ae5bd937e Mon Sep 17 00:00:00 2001 From: OpenActive Date: Fri, 24 Mar 2023 21:10:15 +0000 Subject: [PATCH 08/16] 2.0.299 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 11d40240..2abba7e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.298", + "version": "2.0.299", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0345ad35..d49c97b8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.298", + "version": "2.0.299", "description": "Data models used to drive that OpenActive validator, developer documentation, and model libraries", "homepage": "https://www.openactive.io", "author": "OpenActive Community ", From 7e65d49a7f881ab6bb7db048b5e5c9300b477180 Mon Sep 17 00:00:00 2001 From: Nick Evans <2616208+nickevansuk@users.noreply.github.com> Date: Fri, 24 Mar 2023 22:58:26 +0000 Subject: [PATCH 09/16] feat: Ensure docs are correct, while allowing flexibility for other use (#111) --- versions/2.x/models/Dataset.json | 65 +++++++++++++++++++++----------- versions/2.x/models/WebAPI.json | 49 +++++++++++++++++------- 2 files changed, 78 insertions(+), 36 deletions(-) diff --git a/versions/2.x/models/Dataset.json b/versions/2.x/models/Dataset.json index aba1df87..a7a75e41 100644 --- a/versions/2.x/models/Dataset.json +++ b/versions/2.x/models/Dataset.json @@ -4,32 +4,53 @@ "hasId": true, "sampleId": "https://opendata.fusion-lifestyle.com/OpenActive/", "validationMode": { - "DatasetSite": "datasetSite" + "RPDEFeed": "noRequired", + "BookableRPDEFeed": "noRequired", + "DataCatalog": "noRequired", + "C1Request": "noRequired", + "C1Response": "noRequired", + "C1ResponseOrderItemError": "noRequired", + "C2Request": "noRequired", + "C2Response": "noRequired", + "C2ResponseOrderItemError": "noRequired", + "PRequest": "noRequired", + "PResponse": "noRequired", + "PResponseOrderItemError": "noRequired", + "BRequest": "noRequired", + "BResponse": "noRequired", + "BResponseOrderItemError": "noRequired", + "OrderProposalPatch": "noRequired", + "OrderPatch": "noRequired", + "OrdersFeed": "noRequired", + "OrderProposalsFeed": "noRequired", + "OrderStatus": "noRequired" }, "imperativeConfiguration": { - "datasetSite": { - "requiredFields": [ - "id", - "type", - "url", - "name", - "description", - "keywords", - "license", - "distribution", - "discussionUrl", - "documentation", - "inLanguage", - "publisher", - "schemaVersion" - ], - "recommendedFields": [ - "datePublished", - "dateModified", - "backgroundImage" - ] + "noRequired": { + "requiredFields": [], + "recommendedFields": [] } }, + "requiredFields": [ + "id", + "type", + "url", + "name", + "description", + "keywords", + "license", + "distribution", + "discussionUrl", + "documentation", + "inLanguage", + "publisher", + "schemaVersion" + ], + "recommendedFields": [ + "datePublished", + "dateModified", + "backgroundImage" + ], "inSpec": [ "id", "type", diff --git a/versions/2.x/models/WebAPI.json b/versions/2.x/models/WebAPI.json index 57e8dffa..e020318f 100644 --- a/versions/2.x/models/WebAPI.json +++ b/versions/2.x/models/WebAPI.json @@ -3,24 +3,45 @@ "derivedFrom": "https://pending.schema.org/WebAPI", "hasId": false, "validationMode": { - "DatasetSite": "datasetSite" + "RPDEFeed": "noRequired", + "BookableRPDEFeed": "noRequired", + "DataCatalog": "noRequired", + "C1Request": "noRequired", + "C1Response": "noRequired", + "C1ResponseOrderItemError": "noRequired", + "C2Request": "noRequired", + "C2Response": "noRequired", + "C2ResponseOrderItemError": "noRequired", + "PRequest": "noRequired", + "PResponse": "noRequired", + "PResponseOrderItemError": "noRequired", + "BRequest": "noRequired", + "BResponse": "noRequired", + "BResponseOrderItemError": "noRequired", + "OrderProposalPatch": "noRequired", + "OrderPatch": "noRequired", + "OrdersFeed": "noRequired", + "OrderProposalsFeed": "noRequired", + "OrderStatus": "noRequired" }, "imperativeConfiguration": { - "datasetSite": { - "requiredFields": [ - "type", - "name", - "endpointUrl", - "conformsTo", - "endpointDescription", - "landingPage" - ], - "recommendedFields": [ - "documentation", - "termsOfService" - ] + "noRequired": { + "requiredFields": [], + "recommendedFields": [] } }, + "requiredFields": [ + "type", + "name", + "endpointUrl", + "conformsTo", + "endpointDescription", + "landingPage" + ], + "recommendedFields": [ + "documentation", + "termsOfService" + ], "inSpec": [ "type", "name", From 61e0ddb7166bec36cee53c9fb5a1882282abc78a Mon Sep 17 00:00:00 2001 From: OpenActive Date: Fri, 24 Mar 2023 23:00:12 +0000 Subject: [PATCH 10/16] 2.0.300 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2abba7e0..193cd062 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.299", + "version": "2.0.300", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index d49c97b8..ec336e41 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.299", + "version": "2.0.300", "description": "Data models used to drive that OpenActive validator, developer documentation, and model libraries", "homepage": "https://www.openactive.io", "author": "OpenActive Community ", From a9ce0b5dadf6710e529b80381a9df4e29c1c16be Mon Sep 17 00:00:00 2001 From: Nick Evans <2616208+nickevansuk@users.noreply.github.com> Date: Wed, 28 Jun 2023 13:54:16 +0100 Subject: [PATCH 11/16] fix: individualFacilityUse should not be used in booking responses (#112) --- versions/2.x/models/FacilityUse.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/versions/2.x/models/FacilityUse.json b/versions/2.x/models/FacilityUse.json index 097e875f..5002af4f 100644 --- a/versions/2.x/models/FacilityUse.json +++ b/versions/2.x/models/FacilityUse.json @@ -58,7 +58,8 @@ "shallNotInclude": [ "offers", "event", - "provider" + "provider", + "individualFacilityUse" ] } }, From 342afe697fd6f8e7861a96c44263b20080eaf9f5 Mon Sep 17 00:00:00 2001 From: OpenActive Date: Wed, 28 Jun 2023 12:54:58 +0000 Subject: [PATCH 12/16] 2.0.301 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 193cd062..d3a23384 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.300", + "version": "2.0.301", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ec336e41..7ea5d519 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.300", + "version": "2.0.301", "description": "Data models used to drive that OpenActive validator, developer documentation, and model libraries", "homepage": "https://www.openactive.io", "author": "OpenActive Community ", From d38da73274e64fd99e51624380ce4307b94f1cbb Mon Sep 17 00:00:00 2001 From: Nick Evans <2616208+nickevansuk@users.noreply.github.com> Date: Fri, 18 Aug 2023 16:01:45 +0100 Subject: [PATCH 13/16] fix: Ensure that `PropertyValue` only contains properties that are appropriate for its context (#113) --- versions/2.x/models/PropertyValue.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/versions/2.x/models/PropertyValue.json b/versions/2.x/models/PropertyValue.json index f20384a1..7d01eaef 100644 --- a/versions/2.x/models/PropertyValue.json +++ b/versions/2.x/models/PropertyValue.json @@ -32,6 +32,10 @@ "type", "name", "description" + ], + "shallNotInclude": [ + "value", + "propertyID" ] }, "additionalProperty": { @@ -39,6 +43,10 @@ "type", "name", "value" + ], + "shallNotInclude": [ + "description", + "propertyID" ] }, "orderItemIntakeFormResponse": { @@ -46,6 +54,10 @@ "type", "propertyID", "value" + ], + "shallNotInclude": [ + "name", + "description" ] } } From 0b0e8b5dd4e7728f21c9c2cc55cfb88bbd903235 Mon Sep 17 00:00:00 2001 From: OpenActive Date: Fri, 18 Aug 2023 15:02:37 +0000 Subject: [PATCH 14/16] 2.0.302 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index d3a23384..ac66ac78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.301", + "version": "2.0.302", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7ea5d519..ee2e1376 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.301", + "version": "2.0.302", "description": "Data models used to drive that OpenActive validator, developer documentation, and model libraries", "homepage": "https://www.openactive.io", "author": "OpenActive Community ", From f9e7d874683d23caa4d7c6f627df667fb8cc35e3 Mon Sep 17 00:00:00 2001 From: Nick Evans <2616208+nickevansuk@users.noreply.github.com> Date: Thu, 14 Sep 2023 19:19:20 +0100 Subject: [PATCH 15/16] feat: Dependabot Auto-merge (#114) --- .github/workflows/dependabot-automerge.yml | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/dependabot-automerge.yml diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml new file mode 100644 index 00000000..e70bf5d4 --- /dev/null +++ b/.github/workflows/dependabot-automerge.yml @@ -0,0 +1,23 @@ +name: Dependabot auto-merge +on: pull_request + +permissions: + contents: write + pull-requests: write + +jobs: + dependabot: + runs-on: ubuntu-latest + if: ${{ github.actor == 'dependabot[bot]' }} + steps: + - name: Dependabot metadata + id: metadata + uses: dependabot/fetch-metadata@v1 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + - name: Enable auto-merge for Dependabot PRs + if: ${{contains(steps.metadata.outputs.dependency-names, 'my-dependency') && steps.metadata.outputs.update-type == 'version-update:semver-patch'}} + run: gh pr merge --auto --merge "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} From c9d5c16eeed0cde02e0654e5948e5eef445a58a8 Mon Sep 17 00:00:00 2001 From: OpenActive Date: Thu, 14 Sep 2023 18:20:01 +0000 Subject: [PATCH 16/16] 2.0.303 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index ac66ac78..4009d62a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.302", + "version": "2.0.303", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ee2e1376..12c09e8e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.302", + "version": "2.0.303", "description": "Data models used to drive that OpenActive validator, developer documentation, and model libraries", "homepage": "https://www.openactive.io", "author": "OpenActive Community ",