From 8eab75ed9a1b780d9fd489ed474cd9c4033c2f50 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Sun, 18 Feb 2024 12:13:42 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Format=20YAML=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/dependabot.yml | 1 + .github/release.yml | 11 +++++---- .github/workflows/danger.yml | 24 ++++++++------------ .github/workflows/pr-checks.yml | 39 ++++++++++++-------------------- .github/workflows/release.yml | 18 ++++++--------- .hound.yml | 4 ---- .periphery.yml | 1 + .swiftlint.yml | 8 +++---- Tests/MasKitTests/.swiftlint.yml | 7 +++--- 9 files changed, 47 insertions(+), 66 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ef58025..254c418 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,4 +1,5 @@ # https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates +--- version: 2 updates: - package-ecosystem: "github-actions" diff --git a/.github/release.yml b/.github/release.yml index 778688d..add94e5 100644 --- a/.github/release.yml +++ b/.github/release.yml @@ -1,12 +1,13 @@ # https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes +--- changelog: categories: - - title: '🚀 Features' + - title: "🚀 Features" labels: - - '🆕 feature request' - - title: '🐛 Bug Fixes' + - "🆕 feature request" + - title: "🐛 Bug Fixes" labels: - - '🐛 bug' + - "🐛 bug" - title: Changes labels: - - '*' + - "*" diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index db959dc..f278c8d 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -2,24 +2,20 @@ # .github/workflows/danger.yml # # https://docs.github.com/en/actions/reference/environment-variables#default-environment-variables - +--- name: danger - on: pull_request: - branches: [ main ] - + branches: [main] jobs: danger: runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Danger - # https://github.com/orgs/danger/packages/container/package/danger-swift - uses: docker://ghcr.io/danger/danger-swift:3.18.0 - with: - args: --failOnErrors --no-publish-check - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v4 + - name: Danger + # https://github.com/orgs/danger/packages/container/package/danger-swift + uses: docker://ghcr.io/danger/danger-swift:3.18.0 + with: + args: --failOnErrors --no-publish-check + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index b109b1e..451df14 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -2,23 +2,19 @@ # .github/workflows/pr-checks.yml # # https://docs.github.com/en/actions/reference/environment-variables#default-environment-variables - +--- name: pr-checks - on: pull_request: - branches: [ main ] + branches: [main] push: - branches: [ main ] - + branches: [main] concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true - jobs: build-test: runs-on: macos-14 - defaults: run: # Prefixes all `run` commands with the following command to force them to run outside Rosetta. @@ -26,21 +22,16 @@ jobs: # https://github.com/rolpdog/cffi-mirror/blob/release-1.15/.github/workflows/ci.yaml#L81-L141 # https://github.com/actions/virtual-environments/issues/2187#issuecomment-790507204 shell: arch -arm64 bash --noprofile --norc -eo pipefail {0} - steps: - - uses: actions/checkout@v4 - with: - # A fetch-depth of 0 includes all history and tags for script/version - fetch-depth: 0 - - - name: Bootstrap - run: script/bootstrap - - - name: Build - run: script/build - - - name: Test - run: script/test - - - name: Lint - run: script/lint + - uses: actions/checkout@v4 + with: + # A fetch-depth of 0 includes all history and tags for script/version + fetch-depth: 0 + - name: Bootstrap + run: script/bootstrap + - name: Build + run: script/build + - name: Test + run: script/test + - name: Lint + run: script/lint diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 64b3fcf..415fad9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,22 +1,18 @@ # # .github/workflows/release.yml # - +--- name: release - on: release: types: [published] - jobs: release: runs-on: macos-14 - steps: - - uses: actions/checkout@v4 - with: - # A fetch-depth of 0 includes all history and tags for script/version - fetch-depth: 0 - - - name: Bootstrap - run: script/bootstrap + - uses: actions/checkout@v4 + with: + # A fetch-depth of 0 includes all history and tags for script/version + fetch-depth: 0 + - name: Bootstrap + run: script/bootstrap diff --git a/.hound.yml b/.hound.yml index 79acba6..e3790af 100644 --- a/.hound.yml +++ b/.hound.yml @@ -6,15 +6,11 @@ # --- fail_on_violations: false - erblint: enabled: false - rubocop: enabled: false - shellcheck: enabled: true - swiftlint: enabled: false diff --git a/.periphery.yml b/.periphery.yml index bc809cc..f35a82f 100644 --- a/.periphery.yml +++ b/.periphery.yml @@ -1,2 +1,3 @@ +--- retain_public: true strict: true diff --git a/.swiftlint.yml b/.swiftlint.yml index 852c115..604021a 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -4,12 +4,10 @@ # # https://github.com/realm/SwiftLint#configuration # - +--- disabled_rules: -- trailing_comma - + - trailing_comma excluded: -- docs - + - docs opening_brace: allow_multiline_func: true diff --git a/Tests/MasKitTests/.swiftlint.yml b/Tests/MasKitTests/.swiftlint.yml index daa6dd0..d6780ba 100644 --- a/Tests/MasKitTests/.swiftlint.yml +++ b/Tests/MasKitTests/.swiftlint.yml @@ -4,8 +4,9 @@ # # https://github.com/realm/SwiftLint#configuration # + --- disabled_rules: -- force_cast -- force_try -- function_body_length + - force_cast + - force_try + - function_body_length