From d606f29b714d74344c4bc1059164c23ac643580a Mon Sep 17 00:00:00 2001 From: Alexandre Date: Fri, 18 Feb 2022 17:02:10 +0100 Subject: [PATCH] lint --- .github/workflows/builder.yaml | 18 ++++++------ .github/workflows/check-pr.yaml | 45 +++++++++++++----------------- .github/workflows/lint-checks.yaml | 12 ++++---- papermerge/Dockerfile | 1 + qbittorrent/Dockerfile | 1 + 5 files changed, 36 insertions(+), 41 deletions(-) diff --git a/.github/workflows/builder.yaml b/.github/workflows/builder.yaml index e29c10279..2f7757fdd 100644 --- a/.github/workflows/builder.yaml +++ b/.github/workflows/builder.yaml @@ -1,3 +1,4 @@ +# shellcheck disable=SC2157,SC2086 name: Builder env: @@ -8,7 +9,7 @@ on: branches: - master paths: - - '**/config.*' + - "**/config.*" jobs: check-addon-changes: @@ -16,15 +17,14 @@ jobs: outputs: changedAddons: ${{ steps.filter.outputs.changes }} steps: + - name: ↩ī¸ Checkout + uses: actions/checkout@v2 - - name: ↩ī¸ Checkout - uses: actions/checkout@v2 - - - name: 📂 Detect chanced files - uses: dorny/paths-filter@v2 - id: filter - with: - filters: .github/paths-filter.yml + - name: 📂 Detect chanced files + uses: dorny/paths-filter@v2 + id: filter + with: + filters: .github/paths-filter.yml build: if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }} diff --git a/.github/workflows/check-pr.yaml b/.github/workflows/check-pr.yaml index 87c4fff10..b31343af9 100644 --- a/.github/workflows/check-pr.yaml +++ b/.github/workflows/check-pr.yaml @@ -1,3 +1,4 @@ +# shellcheck disable=SC2076,SC2059 name: Check PR Build on: pull_request: @@ -11,24 +12,23 @@ jobs: changedAddons: ${{ steps.filter.outputs.changes }} changedChangelogFiles: ${{ steps.changed-files.outputs.changelogs_files }} steps: + - name: ↩ī¸ Checkout + uses: actions/checkout@v2 - - name: ↩ī¸ Checkout - uses: actions/checkout@v2 + - name: 📂 Detect chanced addons + uses: dorny/paths-filter@v2 + id: filter + with: + filters: .github/paths-filter.yml - - name: 📂 Detect chanced addons - uses: dorny/paths-filter@v2 - id: filter - with: - filters: .github/paths-filter.yml - - - name: 📂 Detect chanced files - uses: dorny/paths-filter@v2 - id: changed-files - with: - list-files: csv - filters: | - changelogs: - - '**/CHANGELOG.md' + - name: 📂 Detect chanced files + uses: dorny/paths-filter@v2 + id: changed-files + with: + list-files: csv + filters: | + changelogs: + - '**/CHANGELOG.md' check-changed-changelog: name: Check if CHANGELOG.md changed if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }} @@ -39,7 +39,6 @@ jobs: matrix: addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }} steps: - - name: 🔎 Check for updated CHANGELOG.md shell: bash run: | @@ -57,7 +56,6 @@ jobs: matrix: addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }} steps: - - name: ↩ī¸ Checkout uses: actions/checkout@v2 @@ -80,7 +78,6 @@ jobs: matrix: addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }} steps: - - name: ↩ī¸ Checkout uses: actions/checkout@v2 @@ -91,7 +88,7 @@ jobs: if [[ -z "$labeltext" ]]; then echo "::error::There is no label for this addon! Please add it to .github/labels.yaml and .github/labeler.yaml" exit 1 - fi + fi addon-linter: name: Addon linting if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }} @@ -102,7 +99,6 @@ jobs: matrix: addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }} steps: - - name: ↩ī¸ Checkout uses: actions/checkout@v2 @@ -110,7 +106,7 @@ jobs: uses: frenck/action-addon-linter@v2 with: path: "./${{ matrix.addon }}" - + check-build: name: Test addon build if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }} @@ -121,7 +117,6 @@ jobs: matrix: addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }} steps: - - name: ↩ī¸ Checkout uses: actions/checkout@v2 @@ -198,7 +193,7 @@ jobs: - name: 🏗ī¸ Set up Docker Buildx uses: docker/setup-buildx-action@v1 - + - name: đŸ’ŋ Build Addon - armhf if: ${{ steps.information.outputs.armhf == 'true' }} uses: docker/build-push-action@v2 @@ -258,7 +253,7 @@ jobs: build-args: ${{ steps.build_args.outputs.amd64 }} cache-from: type=local,src=/tmp/buildx-cache/amd64 cache-to: type=local,dest=/tmp/buildx-cache-new/amd64 - + - name: đŸ’ŋ Build Addon - i386 if: ${{ steps.information.outputs.i386 == 'true' }} uses: docker/build-push-action@v2 diff --git a/.github/workflows/lint-checks.yaml b/.github/workflows/lint-checks.yaml index 074c33e5e..71c0c915a 100644 --- a/.github/workflows/lint-checks.yaml +++ b/.github/workflows/lint-checks.yaml @@ -1,12 +1,11 @@ +# shellcheck disable=SC2043 name: Lint / Syntax checks on: push: - branches: [ master ] + branches: [master] pull_request: - branches: [ master ] - workflow_run: - branches: [ master ] + branches: [master] jobs: hadolint: @@ -15,7 +14,7 @@ jobs: steps: - name: ↩ī¸ Checkout uses: actions/checkout@v2 - + - name: Get changed files id: changed_files uses: jitterbit/get-changed-files@v1 @@ -35,7 +34,7 @@ jobs: steps: - name: ↩ī¸ Checkout uses: actions/checkout@v2 - + - name: Get changed files id: changed_files uses: jitterbit/get-changed-files@v1 @@ -49,7 +48,6 @@ jobs: fi done - markdownlint: runs-on: ubuntu-latest steps: diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index e5d14c5e8..45b9a5897 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -22,6 +22,7 @@ FROM ${BUILD_FROM} # 2 Modify Image # ################## +# hadolint ignore=SC2015 RUN \ # Allow UID and GID setting sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index 278550479..9d01744bc 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -32,6 +32,7 @@ ENV \ S6_CMD_WAIT_FOR_SERVICES=1 \ TERM="xterm-256color" +# hadolint ignore=SC2015 RUN \ # Allow UID and GID setting sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \