From b4a79bebd86d5e62cea93976e3e5c6885c98628f Mon Sep 17 00:00:00 2001 From: OpenActive Date: Fri, 15 Sep 2023 14:05:23 +0000 Subject: [PATCH 1/3] 2.0.310 --- 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 a5b8c987..c889797e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.309", + "version": "2.0.310", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 296471bc..0cfe250b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.309", + "version": "2.0.310", "description": "Data models used to drive that OpenActive validator, developer documentation, and model libraries", "homepage": "https://www.openactive.io", "author": "OpenActive Community ", From 52007074974546115603c73df2f76fcbe90d525d Mon Sep 17 00:00:00 2001 From: Nick Evans <2616208+nickevansuk@users.noreply.github.com> Date: Fri, 15 Sep 2023 15:08:58 +0100 Subject: [PATCH 2/3] fix: Dependabot auto-merge uses squash (#119) --- .github/workflows/dependabot-automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml index cc4b7bf8..51c15b89 100644 --- a/.github/workflows/dependabot-automerge.yml +++ b/.github/workflows/dependabot-automerge.yml @@ -16,7 +16,7 @@ jobs: with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Enable auto-merge for Dependabot PRs - run: gh pr merge --auto --merge "$PR_URL" + run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} From c4cacfe3ff31f58b72a425e7fe9a8628d8cafe84 Mon Sep 17 00:00:00 2001 From: OpenActive Date: Fri, 15 Sep 2023 14:09:46 +0000 Subject: [PATCH 3/3] 2.0.311 --- 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 c889797e..56fb5045 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.310", + "version": "2.0.311", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0cfe250b..efbb16e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openactive/data-models", - "version": "2.0.310", + "version": "2.0.311", "description": "Data models used to drive that OpenActive validator, developer documentation, and model libraries", "homepage": "https://www.openactive.io", "author": "OpenActive Community ",