Merge master into dependabot/npm_and_yarn/ansi-regex-5.0.1

.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,22 @@
+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
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/pr-base-merge.yml

@@ -0,0 +1,23 @@
+name: Merge base branch into PRs
+
+on:
+  push:
+    branches:
+    # Automatically merge main/master branch into PR local branch.
+    - master
+
+jobs:
+  merge:
+    name: PR base merge
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 1
+    steps:
+    - name: PR base merge
+      uses: deliveryhero/pr-base-auto-merger@main
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        # Delay in seconds between consecutive merges
+        MERGE_DELAY: 5
+        # Label of PRs for which base can be merged. Use '*' to include all open PRs.
+        MERGE_LABEL: '*'

.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