From 99fe50219ddc0b4ac758ec74b2d8a36ff56a7a9f Mon Sep 17 00:00:00 2001 From: Levi Schoen Date: Wed, 30 Nov 2022 14:32:06 -0800 Subject: [PATCH] fix ci workflow order --- .github/workflows/ci-commit.yml | 13 ++----------- .github/workflows/ci-lint.yml | 16 ++++++++++++++++ .github/workflows/ci-master.yml | 6 +++--- 3 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/ci-lint.yml diff --git a/.github/workflows/ci-commit.yml b/.github/workflows/ci-commit.yml index 02644bdb..79b7f2bb 100644 --- a/.github/workflows/ci-commit.yml +++ b/.github/workflows/ci-commit.yml @@ -3,14 +3,5 @@ on: push: # run per commit ci checks against this commit jobs: - proto-lint: - uses: ./.github/workflows/proto.yml - golangci-lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@master - - name: golangci-lint - uses: reviewdog/action-golangci-lint@v1 - with: - github_token: ${{ secrets.github_token }} - reporter: github-pr-review + lint: + uses: ./.github/workflows/ci-lint.yml diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml new file mode 100644 index 00000000..8908ad13 --- /dev/null +++ b/.github/workflows/ci-lint.yml @@ -0,0 +1,16 @@ +name: Lint Checks +on: + workflow_call: +# run per commit ci checks against this commit +jobs: + proto-lint: + uses: ./.github/workflows/proto.yml + golangci-lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: golangci-lint + uses: reviewdog/action-golangci-lint@v1 + with: + github_token: ${{ secrets.github_token }} + reporter: github-pr-review diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml index c96152e2..9cad6c81 100644 --- a/.github/workflows/ci-master.yml +++ b/.github/workflows/ci-master.yml @@ -6,8 +6,8 @@ on: - master jobs: # run per commit ci checks against master branch - commit-checks: - uses: ./.github/workflows/ci-commit.yml + lint-checks: + uses: ./.github/workflows/ci-lint.yml # run default ci checks against master branch default-checks: uses: ./.github/workflows/ci-default.yml @@ -15,7 +15,7 @@ jobs: # configurations for databases, cpu architectures and operating systems publish-internal: # only run if all checks pass - needs: [commit-checks, default-checks] + needs: [lint-checks, default-checks] runs-on: ubuntu-latest steps: - name: set build tag