From 8613e390eb8368540cf5f74f445acaf89f3789db Mon Sep 17 00:00:00 2001 From: Martin Kysel Date: Thu, 19 Dec 2024 13:22:23 -0500 Subject: [PATCH 1/3] Rework how we ignore changes in CI --- .github/workflows/lint.yml | 13 +++++++++---- .github/workflows/solidity.yml | 3 +-- .github/workflows/test.yml | 12 ++++++++---- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3337b154..8a2c0095 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,11 +3,16 @@ on: push: branches: - main - paths-ignore: - - "contracts/**" pull_request: - paths-ignore: - - "contracts/**" + paths: + - ".github/workflows/lint.yml" + - "pkg/**" + - "cmd/**" + - "dev/**" + - "go.mod" + - "go.sum" + - "tools.go" + - ".golangci.yaml" permissions: contents: read jobs: diff --git a/.github/workflows/solidity.yml b/.github/workflows/solidity.yml index cd345b9b..a1482f09 100644 --- a/.github/workflows/solidity.yml +++ b/.github/workflows/solidity.yml @@ -4,11 +4,10 @@ on: push: branches: - main - paths: - - "contracts/**" pull_request: paths: - "contracts/**" + - ".github/workflows/solidity.yml" concurrency: group: ci-solidity-${{ github.ref }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 63105688..8544c06d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,11 +3,15 @@ on: push: branches: - main - paths-ignore: - - "contracts/**" pull_request: - paths-ignore: - - "contracts/**" + paths: + - ".github/workflows/test.yml" + - "pkg/**" + - "cmd/**" + - "dev/**" + - "go.mod" + - "go.sum" + - "tools.go" jobs: test: name: Test (Node) From bd722a30b4c339903cbda2f51803f05c23a76190 Mon Sep 17 00:00:00 2001 From: Martin Kysel Date: Thu, 19 Dec 2024 13:26:14 -0500 Subject: [PATCH 2/3] break-off linter --- .github/workflows/{lint.yml => lint-go.yml} | 8 ++------ .github/workflows/lint-spellcheck.yml | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) rename .github/workflows/{lint.yml => lint-go.yml} (81%) create mode 100644 .github/workflows/lint-spellcheck.yml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint-go.yml similarity index 81% rename from .github/workflows/lint.yml rename to .github/workflows/lint-go.yml index 8a2c0095..8777774c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint-go.yml @@ -5,7 +5,7 @@ on: - main pull_request: paths: - - ".github/workflows/lint.yml" + - ".github/workflows/lint-go.yml" - "pkg/**" - "cmd/**" - "dev/**" @@ -17,14 +17,10 @@ permissions: contents: read jobs: lint: - name: Lint + name: Lint-Go runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: shellcheck - run: | - sudo apt-get -y install tree - dev/lint-shellcheck - uses: actions/setup-go@v3 with: go-version-file: go.mod diff --git a/.github/workflows/lint-spellcheck.yml b/.github/workflows/lint-spellcheck.yml new file mode 100644 index 00000000..af31f544 --- /dev/null +++ b/.github/workflows/lint-spellcheck.yml @@ -0,0 +1,19 @@ +name: Lint +on: + push: + branches: + - main + pull_request: + paths: + - ".github/workflows/lint-spellcheck.yml" + - "dev/**" +jobs: + lint-spellcheck: + name: Lint Spellcheck + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: shellcheck + run: | + sudo apt-get -y install tree + dev/lint-shellcheck From 20fc9980d6a406568049e7bece27906014878f25 Mon Sep 17 00:00:00 2001 From: Martin Kysel Date: Thu, 19 Dec 2024 13:27:09 -0500 Subject: [PATCH 3/3] better --- .github/workflows/lint-go.yml | 2 +- .github/workflows/lint-spellcheck.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-go.yml b/.github/workflows/lint-go.yml index 8777774c..c4ec174b 100644 --- a/.github/workflows/lint-go.yml +++ b/.github/workflows/lint-go.yml @@ -16,7 +16,7 @@ on: permissions: contents: read jobs: - lint: + lint-go: name: Lint-Go runs-on: ubuntu-latest steps: diff --git a/.github/workflows/lint-spellcheck.yml b/.github/workflows/lint-spellcheck.yml index af31f544..46a3a7c8 100644 --- a/.github/workflows/lint-spellcheck.yml +++ b/.github/workflows/lint-spellcheck.yml @@ -1,4 +1,4 @@ -name: Lint +name: Lint Spellcheck on: push: branches: