From 2f5211af91f88a284012c3c7faf7aa90abb46dfc Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Thu, 23 Feb 2023 18:04:00 +0100 Subject: [PATCH 01/32] Test yamllint action --- .github/workflows/e2e-tests-main-devnet.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/e2e-tests-main-devnet.yml b/.github/workflows/e2e-tests-main-devnet.yml index 98ae0e64a4..4f3d0220ba 100644 --- a/.github/workflows/e2e-tests-main-devnet.yml +++ b/.github/workflows/e2e-tests-main-devnet.yml @@ -20,7 +20,21 @@ concurrency: cancel-in-progress: true jobs: + yaml-lint: + name: YAML Lint + runs-on: ubuntu-20.04 + steps: + - name: Checkout source code + uses: actions/checkout@v3 + + - name: Lint e2e-tests-main-devnet.yml + uses: ibiqlik/action-yamllint@v3.1.1 + with: + file_or_dir: ./.github/workflows/e2e-tests-main-devnet.yml + strict: true + build-new-node: + needs: [yaml-lint] name: Build node and runtime artifacts (PR version) uses: ./.github/workflows/build-node-and-runtime.yml secrets: inherit @@ -56,6 +70,7 @@ jobs: build-cliain-image: + needs: [yaml-lint] name: Build docker image for cliain runs-on: ubuntu-20.04 steps: @@ -141,6 +156,7 @@ jobs: build-test-client: + needs: [yaml-lint] name: Build e2e test client suite runs-on: ubuntu-20.04 env: @@ -829,6 +845,7 @@ jobs: run: ./.github/scripts/test_multiple_restarts.sh ${{ matrix.pruning }} check-runtime-change: + needs: [yaml-lint] name: Inspect whether runtime version has been changed (compared with main) runs-on: ubuntu-20.04 outputs: From e797a4d3258d4a2bd22b15e23d810efa9ae64430 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 19:52:20 +0100 Subject: [PATCH 02/32] Add: Separate job for yaml lint [WIP] --- .github/workflows/yaml-lint.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/yaml-lint.yml diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml new file mode 100644 index 0000000000..631f37ed17 --- /dev/null +++ b/.github/workflows/yaml-lint.yml @@ -0,0 +1,31 @@ +name: yaml-lint + +on: + pull_request: + paths: + - '*.yml' + - '*.yaml' + push: + paths: + - '*.yml' + - '*.yaml' + workflow_dispatch: + +concurrency: + group: ${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + +jobs: + main: + name: YAML Lint + runs-on: ubuntu-20.04 + steps: + steps: + - name: Checkout source code + uses: actions/checkout@v3 + + - name: Check diff + id: check-diff + run: | + echo ${{ GITHUB_BASE_REF }} + git --no-pager diff origin/${{ GITHUB_BASE_REF }} --name-only From 39010989196a073a3e7543a0656e5d12ac41d7cb Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 19:58:03 +0100 Subject: [PATCH 03/32] Add main and current feature branch for testing --- .github/workflows/yaml-lint.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 631f37ed17..f3eb5fc38c 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -9,6 +9,9 @@ on: paths: - '*.yml' - '*.yaml' + branches: + - main + - A0-2005-gha-yamllint workflow_dispatch: concurrency: From c97108193d91d2b7431ae4a774aa7b0f73368685 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 19:58:35 +0100 Subject: [PATCH 04/32] typo --- .github/workflows/yaml-lint.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index f3eb5fc38c..9108d0e80c 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -22,7 +22,6 @@ jobs: main: name: YAML Lint runs-on: ubuntu-20.04 - steps: steps: - name: Checkout source code uses: actions/checkout@v3 From 928b3ae89958f33d12dbe73644705e6be11eef7e Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 20:04:46 +0100 Subject: [PATCH 05/32] echo ref_name --- .github/workflows/yaml-lint.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 9108d0e80c..d2a8319535 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -30,4 +30,5 @@ jobs: id: check-diff run: | echo ${{ GITHUB_BASE_REF }} + echo ${{ GITHUB_REF_NAME }} git --no-pager diff origin/${{ GITHUB_BASE_REF }} --name-only From e7a64c76a4df648eb8675b577822cce9d16e95d1 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 20:07:10 +0100 Subject: [PATCH 06/32] Better paths --- .github/workflows/yaml-lint.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index d2a8319535..2df28c45e2 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -3,12 +3,12 @@ name: yaml-lint on: pull_request: paths: - - '*.yml' - - '*.yaml' + - './.github/*/*.yml' + - './.github/*/*.yaml' push: paths: - - '*.yml' - - '*.yaml' + - './.github/*/*.yml' + - './.github/*/*.yaml' branches: - main - A0-2005-gha-yamllint From d5c45ea6845d24d57fd7054701425b2990e14f8c Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 20:26:11 +0100 Subject: [PATCH 07/32] Try to trigger --- .github/workflows/yaml-lint.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 2df28c45e2..1a939d401d 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -3,15 +3,15 @@ name: yaml-lint on: pull_request: paths: - - './.github/*/*.yml' - - './.github/*/*.yaml' + - "./.github/*/*.yml" + - "./.github/*/*.yaml" push: - paths: - - './.github/*/*.yml' - - './.github/*/*.yaml' + # paths: + # - "./.github/*/*.yml" + # - "./.github/*/*.yaml" branches: - - main - - A0-2005-gha-yamllint + - "main" + - "A0-2005-gha-yamllint" workflow_dispatch: concurrency: From 5ed2ed5239d0fcfc3e40b4d219a756acb2814f89 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 20:28:53 +0100 Subject: [PATCH 08/32] vars --- .github/workflows/yaml-lint.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 1a939d401d..4bbeeeba65 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -29,6 +29,6 @@ jobs: - name: Check diff id: check-diff run: | - echo ${{ GITHUB_BASE_REF }} - echo ${{ GITHUB_REF_NAME }} - git --no-pager diff origin/${{ GITHUB_BASE_REF }} --name-only + echo ${{ github.base.ref }} + echo ${{ github.ref.name }} + git --no-pager diff origin/${{ github.base.ref }} --name-only From 5ce15cff1a0ed571e3ac1a8d84bcfd8b8601d6b0 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 20:37:00 +0100 Subject: [PATCH 09/32] as env --- .github/workflows/yaml-lint.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 4bbeeeba65..373c23aeb4 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -6,9 +6,9 @@ on: - "./.github/*/*.yml" - "./.github/*/*.yaml" push: - # paths: - # - "./.github/*/*.yml" - # - "./.github/*/*.yaml" + paths: + - "./.github/*/*.yml" + - "./.github/*/*.yaml" branches: - "main" - "A0-2005-gha-yamllint" @@ -22,6 +22,8 @@ jobs: main: name: YAML Lint runs-on: ubuntu-20.04 + env: + BASE_REF: ${{ GITHUB_BASE_REF }} steps: - name: Checkout source code uses: actions/checkout@v3 @@ -29,6 +31,5 @@ jobs: - name: Check diff id: check-diff run: | - echo ${{ github.base.ref }} - echo ${{ github.ref.name }} - git --no-pager diff origin/${{ github.base.ref }} --name-only + echo ${{ env.BASE_REF }} + git --no-pager diff origin/${{ env.BASE_REF }} --name-only From 5e30c0c9ca7cde62f277bbaa9bf6b3a1eb5005e3 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 20:38:18 +0100 Subject: [PATCH 10/32] double asterisk --- .github/workflows/yaml-lint.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 373c23aeb4..03e099cd58 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -3,12 +3,12 @@ name: yaml-lint on: pull_request: paths: - - "./.github/*/*.yml" - - "./.github/*/*.yaml" + - ".github/**/**.yml" + - ".github/**/**.yaml" push: paths: - - "./.github/*/*.yml" - - "./.github/*/*.yaml" + - ".github/**/**.yml" + - ".github/**/**.yaml" branches: - "main" - "A0-2005-gha-yamllint" From 0d44eb194fca2ba8240ec8b4c2c54e35d27fff61 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 20:43:07 +0100 Subject: [PATCH 11/32] those envs are sketchy --- .github/workflows/yaml-lint.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 03e099cd58..d797968e05 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -22,8 +22,6 @@ jobs: main: name: YAML Lint runs-on: ubuntu-20.04 - env: - BASE_REF: ${{ GITHUB_BASE_REF }} steps: - name: Checkout source code uses: actions/checkout@v3 @@ -31,5 +29,6 @@ jobs: - name: Check diff id: check-diff run: | - echo ${{ env.BASE_REF }} + echo "GITHUB_REF: ${GITHUB_REF}" + echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}" git --no-pager diff origin/${{ env.BASE_REF }} --name-only From 47cb9d9638dc8622bcf8cd528306c1e67b929462 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 20:44:52 +0100 Subject: [PATCH 12/32] missing one env, removed this branched from 'push' event --- .github/workflows/yaml-lint.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index d797968e05..e21147119e 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -11,8 +11,6 @@ on: - ".github/**/**.yaml" branches: - "main" - - "A0-2005-gha-yamllint" - workflow_dispatch: concurrency: group: ${{ github.ref }}-${{ github.workflow }} @@ -31,4 +29,4 @@ jobs: run: | echo "GITHUB_REF: ${GITHUB_REF}" echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}" - git --no-pager diff origin/${{ env.BASE_REF }} --name-only + git --no-pager diff origin/${GITHUB_BASE_REF} --name-only From 4eafc102140af2aaf3f93d36d934062cadebe43c Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 20:52:21 +0100 Subject: [PATCH 13/32] some git tinkering --- .github/workflows/yaml-lint.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index e21147119e..971e9cebaa 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -23,10 +23,16 @@ jobs: steps: - name: Checkout source code uses: actions/checkout@v3 + with: + repository: Cardinal-Cryptography/aleph-node + token: ${{ secrets.CI_GH_TOKEN }} + path: aleph-node - name: Check diff id: check-diff run: | echo "GITHUB_REF: ${GITHUB_REF}" echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}" + cd aleph-node + git fetch origin ${GITHUB_BASE_REF}:refs/remotes/origin/${GITHUB_BASE_REF} git --no-pager diff origin/${GITHUB_BASE_REF} --name-only From 9518c1e7d1aa551ca5a67e485999306c57ee247f Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 20:53:22 +0100 Subject: [PATCH 14/32] try without fetching --- .github/workflows/yaml-lint.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 971e9cebaa..fa521e3337 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -34,5 +34,4 @@ jobs: echo "GITHUB_REF: ${GITHUB_REF}" echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}" cd aleph-node - git fetch origin ${GITHUB_BASE_REF}:refs/remotes/origin/${GITHUB_BASE_REF} git --no-pager diff origin/${GITHUB_BASE_REF} --name-only From d6398542bd7ca1a419c010b7794c641829d8a6f3 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 21:06:33 +0100 Subject: [PATCH 15/32] Fetch is a must-have, removed 'push' triggers --- .github/workflows/yaml-lint.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index fa521e3337..d79156829d 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -5,12 +5,6 @@ on: paths: - ".github/**/**.yml" - ".github/**/**.yaml" - push: - paths: - - ".github/**/**.yml" - - ".github/**/**.yaml" - branches: - - "main" concurrency: group: ${{ github.ref }}-${{ github.workflow }} @@ -34,4 +28,5 @@ jobs: echo "GITHUB_REF: ${GITHUB_REF}" echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}" cd aleph-node + git fetch origin ${GITHUB_BASE_REF}:refs/remotes/origin/${GITHUB_BASE_REF} git --no-pager diff origin/${GITHUB_BASE_REF} --name-only From 3f1ae323f26699c89926ff52ff8700501e8552fc Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 21:27:21 +0100 Subject: [PATCH 16/32] Test diff --- .github/actions/README.md | 1 + .github/workflows/yaml-lint.yml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/README.md b/.github/actions/README.md index 5f841416ea..cb79a9c6d4 100644 --- a/.github/actions/README.md +++ b/.github/actions/README.md @@ -58,3 +58,4 @@ steps: with: test-case: finalization ``` +TEST \ No newline at end of file diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index d79156829d..6dfa2f02e8 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -29,4 +29,5 @@ jobs: echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}" cd aleph-node git fetch origin ${GITHUB_BASE_REF}:refs/remotes/origin/${GITHUB_BASE_REF} - git --no-pager diff origin/${GITHUB_BASE_REF} --name-only + echo "Changed YAML files in this PR:" + git --no-pager diff origin/${GITHUB_BASE_REF} --name-only | grep -i ".yml\|.yaml" From c47c8f0cd78f81db12041e4c0eb1ed17ccf26ce9 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 21:38:46 +0100 Subject: [PATCH 17/32] variable test --- .github/actions/README.md | 1 - .github/workflows/yaml-lint.yml | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/actions/README.md b/.github/actions/README.md index cb79a9c6d4..5f841416ea 100644 --- a/.github/actions/README.md +++ b/.github/actions/README.md @@ -58,4 +58,3 @@ steps: with: test-case: finalization ``` -TEST \ No newline at end of file diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 6dfa2f02e8..8c9ab92128 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -15,19 +15,19 @@ jobs: name: YAML Lint runs-on: ubuntu-20.04 steps: - - name: Checkout source code + - name: GIT | Checkout source code uses: actions/checkout@v3 with: repository: Cardinal-Cryptography/aleph-node token: ${{ secrets.CI_GH_TOKEN }} path: aleph-node - - name: Check diff + - name: GIT | Check diff id: check-diff run: | echo "GITHUB_REF: ${GITHUB_REF}" echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}" cd aleph-node - git fetch origin ${GITHUB_BASE_REF}:refs/remotes/origin/${GITHUB_BASE_REF} - echo "Changed YAML files in this PR:" - git --no-pager diff origin/${GITHUB_BASE_REF} --name-only | grep -i ".yml\|.yaml" + git fetch origin ${GITHUB_BASE_REF}:refs/remotes/origin/${GITHUB_BASE_REF} > /dev/null + YAML_FILES=`git --no-pager diff origin/${GITHUB_BASE_REF} --name-only | grep -i ".yml\|.yaml"` + echo "Changed YAML files: ${YAML_FILES}" From 0d48dd3cc76e9c6d85fe01406c5a826bbb9eed6a Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 21:42:57 +0100 Subject: [PATCH 18/32] Replace '\n' with ' ' --- .github/workflows/yaml-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 8c9ab92128..7d2294b96e 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -29,5 +29,5 @@ jobs: echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}" cd aleph-node git fetch origin ${GITHUB_BASE_REF}:refs/remotes/origin/${GITHUB_BASE_REF} > /dev/null - YAML_FILES=`git --no-pager diff origin/${GITHUB_BASE_REF} --name-only | grep -i ".yml\|.yaml"` + YAML_FILES=`git --no-pager diff origin/${GITHUB_BASE_REF} --name-only | grep -i ".yml\|.yaml" | tr '\n' ' '` echo "Changed YAML files: ${YAML_FILES}" From af594f01361d89bff079903c9990fbe541308410 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 21:44:30 +0100 Subject: [PATCH 19/32] quiet 'git fetch' --- .github/workflows/yaml-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 7d2294b96e..8cf7a2eb32 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -28,6 +28,6 @@ jobs: echo "GITHUB_REF: ${GITHUB_REF}" echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}" cd aleph-node - git fetch origin ${GITHUB_BASE_REF}:refs/remotes/origin/${GITHUB_BASE_REF} > /dev/null + git fetch --quiet origin ${GITHUB_BASE_REF}:refs/remotes/origin/${GITHUB_BASE_REF} YAML_FILES=`git --no-pager diff origin/${GITHUB_BASE_REF} --name-only | grep -i ".yml\|.yaml" | tr '\n' ' '` echo "Changed YAML files: ${YAML_FILES}" From 8d796eb4766705147939ecf636e4da8a8f1e1eeb Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 21:54:13 +0100 Subject: [PATCH 20/32] try to lint --- .github/workflows/yaml-lint.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 8cf7a2eb32..06f9a733a0 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -25,9 +25,14 @@ jobs: - name: GIT | Check diff id: check-diff run: | - echo "GITHUB_REF: ${GITHUB_REF}" - echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}" cd aleph-node git fetch --quiet origin ${GITHUB_BASE_REF}:refs/remotes/origin/${GITHUB_BASE_REF} YAML_FILES=`git --no-pager diff origin/${GITHUB_BASE_REF} --name-only | grep -i ".yml\|.yaml" | tr '\n' ' '` echo "Changed YAML files: ${YAML_FILES}" + echo "YAML_FILES=`echo $YAML_FILES`" >> $GITHUB_ENV + + - name: LINT | Execute yaml-lint + uses: ibiqlik/action-yamllint@v3.1.1 + with: + strict: true + file_or_dir: ${{ steps.check-diff.outputs.YAML_FILES }} From ce6bae89bf9d80840a76f9db3dfabcf945e3713e Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 21:57:14 +0100 Subject: [PATCH 21/32] check again --- .github/workflows/yaml-lint.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 06f9a733a0..842bf459b8 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -35,4 +35,5 @@ jobs: uses: ibiqlik/action-yamllint@v3.1.1 with: strict: true - file_or_dir: ${{ steps.check-diff.outputs.YAML_FILES }} + file_or_dir: .github/workflows/e2e-tests-main-devnet.yml .github/workflows/yaml-lint.yml #${{ steps.check-diff.outputs.YAML_FILES }} + #config_file: aleph-node/.yamllint \ No newline at end of file From bec9a08430557e167e370320c40e2d72494a520d Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 21:58:36 +0100 Subject: [PATCH 22/32] Try without additional repo path --- .github/workflows/yaml-lint.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 842bf459b8..cdd0d1100e 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -20,12 +20,10 @@ jobs: with: repository: Cardinal-Cryptography/aleph-node token: ${{ secrets.CI_GH_TOKEN }} - path: aleph-node - name: GIT | Check diff id: check-diff run: | - cd aleph-node git fetch --quiet origin ${GITHUB_BASE_REF}:refs/remotes/origin/${GITHUB_BASE_REF} YAML_FILES=`git --no-pager diff origin/${GITHUB_BASE_REF} --name-only | grep -i ".yml\|.yaml" | tr '\n' ' '` echo "Changed YAML files: ${YAML_FILES}" @@ -36,4 +34,4 @@ jobs: with: strict: true file_or_dir: .github/workflows/e2e-tests-main-devnet.yml .github/workflows/yaml-lint.yml #${{ steps.check-diff.outputs.YAML_FILES }} - #config_file: aleph-node/.yamllint \ No newline at end of file + #config_file: .yamllint \ No newline at end of file From dad29485cf7b341c325e5eae3d6c03f986c61d29 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 21:59:58 +0100 Subject: [PATCH 23/32] Try again with output --- .github/workflows/yaml-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index cdd0d1100e..d664149329 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -33,5 +33,5 @@ jobs: uses: ibiqlik/action-yamllint@v3.1.1 with: strict: true - file_or_dir: .github/workflows/e2e-tests-main-devnet.yml .github/workflows/yaml-lint.yml #${{ steps.check-diff.outputs.YAML_FILES }} + file_or_dir: ${{ steps.check-diff.outputs.YAML_FILES }} #config_file: .yamllint \ No newline at end of file From 73982d3bc407c8c34dc683273f8285147d7f118b Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 22:02:00 +0100 Subject: [PATCH 24/32] Try as an env --- .github/workflows/yaml-lint.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index d664149329..3a22ddf54d 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -31,7 +31,9 @@ jobs: - name: LINT | Execute yaml-lint uses: ibiqlik/action-yamllint@v3.1.1 + env: + YAML_FILES: ${{ steps.check-diff.outputs.YAML_FILES }} with: strict: true - file_or_dir: ${{ steps.check-diff.outputs.YAML_FILES }} + file_or_dir: ${{ env.YAML_FILES }} #config_file: .yamllint \ No newline at end of file From 35c32b374b9742673abf86f1e7061558da1fea1e Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 22:03:25 +0100 Subject: [PATCH 25/32] i hate it --- .github/workflows/yaml-lint.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 3a22ddf54d..cc3a94d071 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -31,8 +31,6 @@ jobs: - name: LINT | Execute yaml-lint uses: ibiqlik/action-yamllint@v3.1.1 - env: - YAML_FILES: ${{ steps.check-diff.outputs.YAML_FILES }} with: strict: true file_or_dir: ${{ env.YAML_FILES }} From 7dca1c3d8e7adf139e5b257b0529e7e55f40e78c Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 22:09:16 +0100 Subject: [PATCH 26/32] Test to trigger linter after editing new files --- .github/workflows/deploy-to-devnet.yml | 1 + .github/workflows/unit_tests.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/deploy-to-devnet.yml b/.github/workflows/deploy-to-devnet.yml index 9687480835..63e39bfa1f 100644 --- a/.github/workflows/deploy-to-devnet.yml +++ b/.github/workflows/deploy-to-devnet.yml @@ -126,3 +126,4 @@ jobs: notify-on: "failure" env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + TEST: test diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 7d50986f7c..d8a8f8ffb5 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -62,6 +62,7 @@ jobs: - name: Run Linter uses: actions-rs/cargo@v1 env: + TEST: TEST # https://github.com/mozilla/sccache/issues/966 RUSTC_WRAPPER: "" RUSTC_WORKSPACE_WRAPPER: sccache From 77a25805e29b9c2b87870331dc50506bf7485581 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Fri, 24 Feb 2023 22:10:51 +0100 Subject: [PATCH 27/32] Test to trigger linter after editing new files - remove those changes --- .github/workflows/deploy-to-devnet.yml | 1 - .github/workflows/unit_tests.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/deploy-to-devnet.yml b/.github/workflows/deploy-to-devnet.yml index 63e39bfa1f..9687480835 100644 --- a/.github/workflows/deploy-to-devnet.yml +++ b/.github/workflows/deploy-to-devnet.yml @@ -126,4 +126,3 @@ jobs: notify-on: "failure" env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - TEST: test diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index d8a8f8ffb5..7d50986f7c 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -62,7 +62,6 @@ jobs: - name: Run Linter uses: actions-rs/cargo@v1 env: - TEST: TEST # https://github.com/mozilla/sccache/issues/966 RUSTC_WRAPPER: "" RUSTC_WORKSPACE_WRAPPER: sccache From b1efdb9410b0611984c5c82284e09ab19a9059d7 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Mon, 27 Feb 2023 16:14:16 +0100 Subject: [PATCH 28/32] Better grep --- .github/workflows/yaml-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index cc3a94d071..2d96cc2511 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -25,7 +25,7 @@ jobs: id: check-diff run: | git fetch --quiet origin ${GITHUB_BASE_REF}:refs/remotes/origin/${GITHUB_BASE_REF} - YAML_FILES=`git --no-pager diff origin/${GITHUB_BASE_REF} --name-only | grep -i ".yml\|.yaml" | tr '\n' ' '` + YAML_FILES=`git --no-pager diff origin/${GITHUB_BASE_REF} --name-only | grep -E ".github\/.*\/.*(.yaml|.yml)" | tr '\n' ' '` echo "Changed YAML files: ${YAML_FILES}" echo "YAML_FILES=`echo $YAML_FILES`" >> $GITHUB_ENV From 4c7d4466dfe805899b7158dfb177d3d3949078ad Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Wed, 1 Mar 2023 20:39:31 +0100 Subject: [PATCH 29/32] Add .yamllint config and remove nested lint in e2e-tests-main-devnet --- .github/workflows/e2e-tests-main-devnet.yml | 17 ------- .github/workflows/yaml-lint.yml | 4 +- .yamllint | 53 +++++++++++++++++++++ 3 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 .yamllint diff --git a/.github/workflows/e2e-tests-main-devnet.yml b/.github/workflows/e2e-tests-main-devnet.yml index 4f3d0220ba..98ae0e64a4 100644 --- a/.github/workflows/e2e-tests-main-devnet.yml +++ b/.github/workflows/e2e-tests-main-devnet.yml @@ -20,21 +20,7 @@ concurrency: cancel-in-progress: true jobs: - yaml-lint: - name: YAML Lint - runs-on: ubuntu-20.04 - steps: - - name: Checkout source code - uses: actions/checkout@v3 - - - name: Lint e2e-tests-main-devnet.yml - uses: ibiqlik/action-yamllint@v3.1.1 - with: - file_or_dir: ./.github/workflows/e2e-tests-main-devnet.yml - strict: true - build-new-node: - needs: [yaml-lint] name: Build node and runtime artifacts (PR version) uses: ./.github/workflows/build-node-and-runtime.yml secrets: inherit @@ -70,7 +56,6 @@ jobs: build-cliain-image: - needs: [yaml-lint] name: Build docker image for cliain runs-on: ubuntu-20.04 steps: @@ -156,7 +141,6 @@ jobs: build-test-client: - needs: [yaml-lint] name: Build e2e test client suite runs-on: ubuntu-20.04 env: @@ -845,7 +829,6 @@ jobs: run: ./.github/scripts/test_multiple_restarts.sh ${{ matrix.pruning }} check-runtime-change: - needs: [yaml-lint] name: Inspect whether runtime version has been changed (compared with main) runs-on: ubuntu-20.04 outputs: diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index 2d96cc2511..d420604186 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -1,3 +1,4 @@ +--- name: yaml-lint on: @@ -28,10 +29,11 @@ jobs: YAML_FILES=`git --no-pager diff origin/${GITHUB_BASE_REF} --name-only | grep -E ".github\/.*\/.*(.yaml|.yml)" | tr '\n' ' '` echo "Changed YAML files: ${YAML_FILES}" echo "YAML_FILES=`echo $YAML_FILES`" >> $GITHUB_ENV + ls -l - name: LINT | Execute yaml-lint uses: ibiqlik/action-yamllint@v3.1.1 with: strict: true file_or_dir: ${{ env.YAML_FILES }} - #config_file: .yamllint \ No newline at end of file + config_file: .yamllint diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000000..4018fe15ec --- /dev/null +++ b/.yamllint @@ -0,0 +1,53 @@ +--- +extends: default + +rules: + braces: + min-spaces-inside: 0 + max-spaces-inside: 0 + min-spaces-inside-empty: -1 + max-spaces-inside-empty: -1 + brackets: + min-spaces-inside: 0 + max-spaces-inside: 0 + min-spaces-inside-empty: -1 + max-spaces-inside-empty: -1 + colons: + max-spaces-before: 0 + max-spaces-after: 1 + commas: + max-spaces-before: 0 + min-spaces-after: 1 + max-spaces-after: 1 + comments: + level: warning + require-starting-space: true + min-spaces-from-content: 2 + comments-indentation: disable + document-end: disable + document-start: enable + empty-lines: + max: 2 + max-start: 1 + max-end: 1 + empty-values: + forbid-in-block-mappings: false + forbid-in-flow-mappings: false + hyphens: + max-spaces-after: 1 + indentation: + spaces: consistent + indent-sequences: true + check-multi-line-strings: false + key-duplicates: enable + key-ordering: disable + line-length: + max: 100 + level: warning + allow-non-breakable-words: true + allow-non-breakable-inline-mappings: false + new-line-at-end-of-file: enable + new-lines: + type: unix + trailing-spaces: enable + truthy: disable From 7aaf2d6fe99cf9b16854bfa7baef034f496cde53 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Wed, 1 Mar 2023 20:55:17 +0100 Subject: [PATCH 30/32] Fixed lenght of line --- .github/workflows/yaml-lint.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml index d420604186..69b31b74be 100644 --- a/.github/workflows/yaml-lint.yml +++ b/.github/workflows/yaml-lint.yml @@ -1,5 +1,5 @@ --- -name: yaml-lint +name: GH Action YAML linter on: pull_request: @@ -26,10 +26,10 @@ jobs: id: check-diff run: | git fetch --quiet origin ${GITHUB_BASE_REF}:refs/remotes/origin/${GITHUB_BASE_REF} - YAML_FILES=`git --no-pager diff origin/${GITHUB_BASE_REF} --name-only | grep -E ".github\/.*\/.*(.yaml|.yml)" | tr '\n' ' '` + YAML_FILES=`git --no-pager diff origin/${GITHUB_BASE_REF} --name-only \ + | grep -E ".github\/.*\/.*(.yaml|.yml)" | tr '\n' ' '` echo "Changed YAML files: ${YAML_FILES}" echo "YAML_FILES=`echo $YAML_FILES`" >> $GITHUB_ENV - ls -l - name: LINT | Execute yaml-lint uses: ibiqlik/action-yamllint@v3.1.1 From 7ee4cc40f18c2704ea37e825e6bccb96002c204a Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Wed, 1 Mar 2023 21:02:32 +0100 Subject: [PATCH 31/32] Enforced true and false instead of other boolean values --- .yamllint | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.yamllint b/.yamllint index 4018fe15ec..73d2647f31 100644 --- a/.yamllint +++ b/.yamllint @@ -50,4 +50,8 @@ rules: new-lines: type: unix trailing-spaces: enable - truthy: disable + truthy: + allowed-values: + - "true" + - "false" + check-keys: false From cea6876bcef4834712d4f0c2bffaae983d0c4e53 Mon Sep 17 00:00:00 2001 From: Piotr Kusinski Date: Thu, 2 Mar 2023 16:00:07 +0100 Subject: [PATCH 32/32] Set line-length to error --- .yamllint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamllint b/.yamllint index 73d2647f31..e53f35d245 100644 --- a/.yamllint +++ b/.yamllint @@ -43,7 +43,7 @@ rules: key-ordering: disable line-length: max: 100 - level: warning + level: error allow-non-breakable-words: true allow-non-breakable-inline-mappings: false new-line-at-end-of-file: enable