From 9e38c0c860ed0adb6dc2af63b28120241dd11971 Mon Sep 17 00:00:00 2001 From: Josh Rose Date: Tue, 30 Jan 2024 11:03:51 +0100 Subject: [PATCH] style: yaml lint cleanup --- .github/mergify.yml | 15 ++++++++------- .github/semantic.yml | 1 + .github/workflows/ci.yml | 28 ++++++++++++++-------------- .github/workflows/publish.yml | 2 +- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index a540f4f..11607fb 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,14 +1,15 @@ +--- pull_request_rules: - name: Automerge when checks pass and reviews are approved conditions: - and: - - author~=!^dependabot(|-preview)\[bot\]$ - - label!=wontfix - - check-success=build - - check-success=test - - check-success=megalinter - - check-success=SonarCloud Code Analysis - - "#approved-reviews-by>=1" + - author~=!^dependabot(|-preview)\[bot\]$ + - label!=wontfix + - check-success=build + - check-success=test + - check-success=megalinter + - check-success=SonarCloud Code Analysis + - "#approved-reviews-by>=1" actions: merge: method: merge diff --git a/.github/semantic.yml b/.github/semantic.yml index 00b89c7..8185c3b 100644 --- a/.github/semantic.yml +++ b/.github/semantic.yml @@ -1,3 +1,4 @@ +--- # Always validate the PR title AND all the commits titleAndCommits: true # Allows use of Merge commits (eg on github: "Merge branch 'main' into feature/ride-unicorns") diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 445514b..7e37135 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,23 +14,23 @@ jobs: version: [18, 20] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.version }} - cache: 'npm' - - run: npm ci - - run: npm test + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.version }} + cache: 'npm' + - run: npm ci + - run: npm test build: strategy: matrix: version: [18, 20] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.version }} - cache: 'npm' - - run: npm ci - - run: npm run build + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.version }} + cache: 'npm' + - run: npm ci + - run: npm run build diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a88316c..5f96dcb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,7 +3,7 @@ name: 🚀 Publish on: push: branches: - - main + - main env: HUSKY: 0 jobs: