This commit is contained in:
Alexandre
2022-02-18 17:02:10 +01:00
parent 0d1f2f0489
commit d606f29b71
5 changed files with 36 additions and 41 deletions

View File

@@ -1,3 +1,4 @@
# shellcheck disable=SC2157,SC2086
name: Builder name: Builder
env: env:
@@ -8,7 +9,7 @@ on:
branches: branches:
- master - master
paths: paths:
- '**/config.*' - "**/config.*"
jobs: jobs:
check-addon-changes: check-addon-changes:
@@ -16,15 +17,14 @@ jobs:
outputs: outputs:
changedAddons: ${{ steps.filter.outputs.changes }} changedAddons: ${{ steps.filter.outputs.changes }}
steps: steps:
- name: ↩️ Checkout
uses: actions/checkout@v2
- name: ↩️ Checkout - name: 📂 Detect chanced files
uses: actions/checkout@v2 uses: dorny/paths-filter@v2
id: filter
- name: 📂 Detect chanced files with:
uses: dorny/paths-filter@v2 filters: .github/paths-filter.yml
id: filter
with:
filters: .github/paths-filter.yml
build: build:
if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }} if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }}

View File

@@ -1,3 +1,4 @@
# shellcheck disable=SC2076,SC2059
name: Check PR Build name: Check PR Build
on: on:
pull_request: pull_request:
@@ -11,24 +12,23 @@ jobs:
changedAddons: ${{ steps.filter.outputs.changes }} changedAddons: ${{ steps.filter.outputs.changes }}
changedChangelogFiles: ${{ steps.changed-files.outputs.changelogs_files }} changedChangelogFiles: ${{ steps.changed-files.outputs.changelogs_files }}
steps: steps:
- name: ↩️ Checkout
uses: actions/checkout@v2
- name: ↩️ Checkout - name: 📂 Detect chanced addons
uses: actions/checkout@v2 uses: dorny/paths-filter@v2
id: filter
with:
filters: .github/paths-filter.yml
- name: 📂 Detect chanced addons - name: 📂 Detect chanced files
uses: dorny/paths-filter@v2 uses: dorny/paths-filter@v2
id: filter id: changed-files
with: with:
filters: .github/paths-filter.yml list-files: csv
filters: |
- name: 📂 Detect chanced files changelogs:
uses: dorny/paths-filter@v2 - '**/CHANGELOG.md'
id: changed-files
with:
list-files: csv
filters: |
changelogs:
- '**/CHANGELOG.md'
check-changed-changelog: check-changed-changelog:
name: Check if CHANGELOG.md changed name: Check if CHANGELOG.md changed
if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }} if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }}
@@ -39,7 +39,6 @@ jobs:
matrix: matrix:
addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }} addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }}
steps: steps:
- name: 🔎 Check for updated CHANGELOG.md - name: 🔎 Check for updated CHANGELOG.md
shell: bash shell: bash
run: | run: |
@@ -57,7 +56,6 @@ jobs:
matrix: matrix:
addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }} addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }}
steps: steps:
- name: ↩️ Checkout - name: ↩️ Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
@@ -80,7 +78,6 @@ jobs:
matrix: matrix:
addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }} addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }}
steps: steps:
- name: ↩️ Checkout - name: ↩️ Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
@@ -91,7 +88,7 @@ jobs:
if [[ -z "$labeltext" ]]; then if [[ -z "$labeltext" ]]; then
echo "::error::There is no label for this addon! Please add it to .github/labels.yaml and .github/labeler.yaml" echo "::error::There is no label for this addon! Please add it to .github/labels.yaml and .github/labeler.yaml"
exit 1 exit 1
fi fi
addon-linter: addon-linter:
name: Addon linting name: Addon linting
if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }} if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }}
@@ -102,7 +99,6 @@ jobs:
matrix: matrix:
addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }} addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }}
steps: steps:
- name: ↩️ Checkout - name: ↩️ Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
@@ -110,7 +106,7 @@ jobs:
uses: frenck/action-addon-linter@v2 uses: frenck/action-addon-linter@v2
with: with:
path: "./${{ matrix.addon }}" path: "./${{ matrix.addon }}"
check-build: check-build:
name: Test addon build name: Test addon build
if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }} if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }}
@@ -121,7 +117,6 @@ jobs:
matrix: matrix:
addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }} addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }}
steps: steps:
- name: ↩️ Checkout - name: ↩️ Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
@@ -198,7 +193,7 @@ jobs:
- name: 🏗️ Set up Docker Buildx - name: 🏗️ Set up Docker Buildx
uses: docker/setup-buildx-action@v1 uses: docker/setup-buildx-action@v1
- name: 💿 Build Addon - armhf - name: 💿 Build Addon - armhf
if: ${{ steps.information.outputs.armhf == 'true' }} if: ${{ steps.information.outputs.armhf == 'true' }}
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
@@ -258,7 +253,7 @@ jobs:
build-args: ${{ steps.build_args.outputs.amd64 }} build-args: ${{ steps.build_args.outputs.amd64 }}
cache-from: type=local,src=/tmp/buildx-cache/amd64 cache-from: type=local,src=/tmp/buildx-cache/amd64
cache-to: type=local,dest=/tmp/buildx-cache-new/amd64 cache-to: type=local,dest=/tmp/buildx-cache-new/amd64
- name: 💿 Build Addon - i386 - name: 💿 Build Addon - i386
if: ${{ steps.information.outputs.i386 == 'true' }} if: ${{ steps.information.outputs.i386 == 'true' }}
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2

View File

@@ -1,12 +1,11 @@
# shellcheck disable=SC2043
name: Lint / Syntax checks name: Lint / Syntax checks
on: on:
push: push:
branches: [ master ] branches: [master]
pull_request: pull_request:
branches: [ master ] branches: [master]
workflow_run:
branches: [ master ]
jobs: jobs:
hadolint: hadolint:
@@ -15,7 +14,7 @@ jobs:
steps: steps:
- name: ↩️ Checkout - name: ↩️ Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Get changed files - name: Get changed files
id: changed_files id: changed_files
uses: jitterbit/get-changed-files@v1 uses: jitterbit/get-changed-files@v1
@@ -35,7 +34,7 @@ jobs:
steps: steps:
- name: ↩️ Checkout - name: ↩️ Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Get changed files - name: Get changed files
id: changed_files id: changed_files
uses: jitterbit/get-changed-files@v1 uses: jitterbit/get-changed-files@v1
@@ -49,7 +48,6 @@ jobs:
fi fi
done done
markdownlint: markdownlint:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:

View File

@@ -22,6 +22,7 @@ FROM ${BUILD_FROM}
# 2 Modify Image # # 2 Modify Image #
################## ##################
# hadolint ignore=SC2015
RUN \ RUN \
# Allow UID and GID setting # Allow UID and GID setting
sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \

View File

@@ -32,6 +32,7 @@ ENV \
S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES=1 \
TERM="xterm-256color" TERM="xterm-256color"
# hadolint ignore=SC2015
RUN \ RUN \
# Allow UID and GID setting # Allow UID and GID setting
sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \