From 0b894ffaf39a5019ca22c00459891638255055df Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Wed, 9 Feb 2022 21:09:18 +1100 Subject: [PATCH 1/2] merged metadata? --- .github/workflows/push.yml | 17 +++++++++++++++-- .github/workflows/shellcheck.yml | 15 --------------- 2 files changed, 15 insertions(+), 17 deletions(-) delete mode 100644 .github/workflows/shellcheck.yml diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index bcfabc33..ea6b0ac9 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -48,7 +48,7 @@ jobs: - name: Archive ${{ matrix.model }} index file uses: actions/upload-artifact@v2 with: - name: ${{ matrix.model }}.json + name: metadata.zip path: source/Hexfile/${{ matrix.model }}.json build_multi-lang: @@ -95,7 +95,7 @@ jobs: - name: Archive ${{ matrix.model }} index file uses: actions/upload-artifact@v2 with: - name: ${{ matrix.model }}_multi-lang.json + name: metadata.zip path: source/Hexfile/${{ matrix.model }}.json tests: @@ -149,3 +149,16 @@ jobs: - name: Check python with flake8 run: flake8 Translations + + shellcheck: + name: runner / shellcheck + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: shellcheck + uses: reviewdog/action-shellcheck@v1 + with: + github_token: ${{ secrets.github_token }} + reporter: github-pr-review # Change reporter. + exclude: "./.git/*" # Optional. + check_all_files_with_shebangs: "false" # Optional. diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml deleted file mode 100644 index 8def392d..00000000 --- a/.github/workflows/shellcheck.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Shell Check -on: [pull_request] -jobs: - shellcheck: - name: runner / shellcheck - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: shellcheck - uses: reviewdog/action-shellcheck@v1 - with: - github_token: ${{ secrets.github_token }} - reporter: github-pr-review # Change reporter. - exclude: "./.git/*" # Optional. - check_all_files_with_shebangs: "false" # Optional. From 6c058f93d57267bf058a9fba7a3de3635b68ed3e Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Wed, 9 Feb 2022 21:11:47 +1100 Subject: [PATCH 2/2] Update push.yml --- .github/workflows/push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index ea6b0ac9..738ecfcc 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -48,7 +48,7 @@ jobs: - name: Archive ${{ matrix.model }} index file uses: actions/upload-artifact@v2 with: - name: metadata.zip + name: metadata path: source/Hexfile/${{ matrix.model }}.json build_multi-lang: @@ -95,7 +95,7 @@ jobs: - name: Archive ${{ matrix.model }} index file uses: actions/upload-artifact@v2 with: - name: metadata.zip + name: metadata path: source/Hexfile/${{ matrix.model }}.json tests: