From 2d2ae5a861405307cec5d07963d4a00efca95057 Mon Sep 17 00:00:00 2001 From: Epic Curious <109078515+epiccurious@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:22:07 -0500 Subject: [PATCH 1/4] ci: consolidate yaml files --- .github/workflows/markdown_validation_ci.yaml | 20 ------------------- ..._validation_ci.yaml => validation_ci.yaml} | 16 ++++++++++++--- 2 files changed, 13 insertions(+), 23 deletions(-) delete mode 100644 .github/workflows/markdown_validation_ci.yaml rename .github/workflows/{bash_validation_ci.yaml => validation_ci.yaml} (80%) diff --git a/.github/workflows/markdown_validation_ci.yaml b/.github/workflows/markdown_validation_ci.yaml deleted file mode 100644 index 52dc5dd..0000000 --- a/.github/workflows/markdown_validation_ci.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: Markdown CI - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - - workflow_dispatch: - -jobs: - markdown-link-check: - name: Validation with markdown-link-check - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@master - - name: Run markdown-link-check on documentation - uses: gaurav-nelson/github-action-markdown-link-check@v1 - with: - use-verbose-mode: 'yes' diff --git a/.github/workflows/bash_validation_ci.yaml b/.github/workflows/validation_ci.yaml similarity index 80% rename from .github/workflows/bash_validation_ci.yaml rename to .github/workflows/validation_ci.yaml index af22c5c..3b68834 100644 --- a/.github/workflows/bash_validation_ci.yaml +++ b/.github/workflows/validation_ci.yaml @@ -12,7 +12,7 @@ env: TERM: xterm jobs: - validate-shellcheck: + bash-lint: name: Validate with ShellCheck runs-on: ubuntu-latest steps: @@ -22,7 +22,7 @@ jobs: env: SHELLCHECK_OPTS: -e SC1091 - validate-shfmt: + bash-format: name: Validate with shfmt runs-on: ubuntu-latest steps: @@ -34,10 +34,20 @@ jobs: with: sh_checker_shellcheck_disable: true + markdown-links: + name: Validation with markdown-link-check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: Run markdown-link-check on Documentation + uses: gaurav-nelson/github-action-markdown-link-check@v1 + with: + use-verbose-mode: 'yes' + run-scripts: name: Execute the scripts runs-on: ubuntu-latest - needs: [validate-shellcheck, validate-shfmt] + needs: [bash-lint, bash-format] steps: - uses: actions/checkout@v4 - name: Install runtime dependency python3-virtualenv From 100b2dddfb783aadc09a552a65ead49c75b50133 Mon Sep 17 00:00:00 2001 From: Epic Curious <109078515+epiccurious@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:23:20 -0500 Subject: [PATCH 2/4] Update validation_ci.yaml --- .github/workflows/validation_ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validation_ci.yaml b/.github/workflows/validation_ci.yaml index 3b68834..9fc83dc 100644 --- a/.github/workflows/validation_ci.yaml +++ b/.github/workflows/validation_ci.yaml @@ -1,4 +1,4 @@ -name: Bash CI +name: Validation CI on: push: From 18f871a5411f89f1f3c60049fb6d6966be4e7796 Mon Sep 17 00:00:00 2001 From: Epic Curious <109078515+epiccurious@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:27:56 -0500 Subject: [PATCH 3/4] ci: run the generic script last --- .github/workflows/validation_ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/validation_ci.yaml b/.github/workflows/validation_ci.yaml index 9fc83dc..22d678e 100644 --- a/.github/workflows/validation_ci.yaml +++ b/.github/workflows/validation_ci.yaml @@ -52,13 +52,13 @@ jobs: - uses: actions/checkout@v4 - name: Install runtime dependency python3-virtualenv run: sudo apt update && sudo apt install -y python3-virtualenv - - name: Run flash_your_device - run: timeout 240 /bin/bash -x ./flash_your_device - name: Run flash_the_ttgo_tdisplay - run: timeout 30 /bin/bash -x ./device_specific/flash_the_ttgo_tdisplay + run: timeout 240 /bin/bash -x ./device_specific/flash_the_ttgo_tdisplay - name: Run flash_the_m5stack_m5stickc_plus run: timeout 30 /bin/bash -x ./device_specific/flash_the_m5stack_m5stickc_plus - name: Run flash_the_m5stack_core_basic run: timeout 30 /bin/bash -x ./device_specific/flash_the_m5stack_core_basic - name: Run flash_the_m5stack_fire run: timeout 30 /bin/bash -x ./device_specific/flash_the_m5stack_fire + - name: Run flash_your_device + run: timeout 30 /bin/bash -x ./flash_your_device From b78ca07b6fd2d059b164c85d45cad1f1db146a32 Mon Sep 17 00:00:00 2001 From: Epic Curious <109078515+epiccurious@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:33:49 -0500 Subject: [PATCH 4/4] ci: improve timeouts --- .github/workflows/validation_ci.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/validation_ci.yaml b/.github/workflows/validation_ci.yaml index 22d678e..46149fc 100644 --- a/.github/workflows/validation_ci.yaml +++ b/.github/workflows/validation_ci.yaml @@ -53,12 +53,12 @@ jobs: - name: Install runtime dependency python3-virtualenv run: sudo apt update && sudo apt install -y python3-virtualenv - name: Run flash_the_ttgo_tdisplay - run: timeout 240 /bin/bash -x ./device_specific/flash_the_ttgo_tdisplay + run: timeout 300 /bin/bash -x ./device_specific/flash_the_ttgo_tdisplay - name: Run flash_the_m5stack_m5stickc_plus - run: timeout 30 /bin/bash -x ./device_specific/flash_the_m5stack_m5stickc_plus + run: timeout 20 /bin/bash -x ./device_specific/flash_the_m5stack_m5stickc_plus - name: Run flash_the_m5stack_core_basic - run: timeout 30 /bin/bash -x ./device_specific/flash_the_m5stack_core_basic + run: timeout 20 /bin/bash -x ./device_specific/flash_the_m5stack_core_basic - name: Run flash_the_m5stack_fire - run: timeout 30 /bin/bash -x ./device_specific/flash_the_m5stack_fire + run: timeout 20 /bin/bash -x ./device_specific/flash_the_m5stack_fire - name: Run flash_your_device - run: timeout 30 /bin/bash -x ./flash_your_device + run: timeout 60 /bin/bash -x ./flash_your_device