From 76402f631e482c80aa05f79d5ad3048470b80acb Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Fri, 30 Aug 2024 23:59:27 +0200 Subject: [PATCH] fixes --- .github/workflows/md-link-checker.yml | 13 ++++--------- .github/workflows/test-integration.yml | 16 ---------------- .github/workflows/test-lint.yml | 16 +--------------- .github/workflows/test.yml | 16 ---------------- 4 files changed, 5 insertions(+), 56 deletions(-) diff --git a/.github/workflows/md-link-checker.yml b/.github/workflows/md-link-checker.yml index be62b6c222..6271fd20a4 100644 --- a/.github/workflows/md-link-checker.yml +++ b/.github/workflows/md-link-checker.yml @@ -1,7 +1,11 @@ name: Check Markdown links on: pull_request: + paths: + - "**.*.md" push: + paths: + - "**.*.md" branches: - main - release/* @@ -14,17 +18,8 @@ jobs: markdown-link-check: runs-on: ubuntu-latest steps: -<<<<<<< HEAD - uses: actions/checkout@v3.4.0 - - uses: technote-space/get-diff-action@v6.1.2 - with: - PATTERNS: | - **/*.md -======= - - uses: actions/checkout@v4 ->>>>>>> 294ec4d5 (ci: always run ci (#4334)) - uses: gaurav-nelson/github-action-markdown-link-check@1.0.13 - if: env.GIT_DIFF with: folder-path: "." use-verbose-mode: "yes" diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 2ab68d4391..98687af656 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -36,28 +36,12 @@ jobs: os: [ubuntu-latest, macos-latest] test-path: ${{fromJson(needs.pre-test.outputs.matrix)}} steps: -<<<<<<< HEAD - uses: actions/checkout@v3.4.0 - - uses: technote-space/get-diff-action@v6.1.2 - with: - PATTERNS: | - **/*.go - **/*.plush - **/*.tpl - go.mod - go.sum - **/testdata/** -======= - - uses: actions/checkout@v4 ->>>>>>> 294ec4d5 (ci: always run ci (#4334)) - - uses: actions/setup-go@v4 - if: env.GIT_DIFF with: go-version: "stable" - name: Run Integration Tests - if: env.GIT_DIFF env: GOTOOLCHAIN: local+path GOSUMDB: off diff --git a/.github/workflows/test-lint.yml b/.github/workflows/test-lint.yml index e9725f9837..d9c7ec43cd 100644 --- a/.github/workflows/test-lint.yml +++ b/.github/workflows/test-lint.yml @@ -4,7 +4,7 @@ on: pull_request: push: paths-ignore: - - '**.md' + - "**.md" branches: - main - release/* @@ -19,27 +19,13 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 6 steps: -<<<<<<< HEAD - uses: actions/checkout@v3.4.0 - - uses: technote-space/get-diff-action@v6.1.2 - with: - PATTERNS: | - **/*.go - **/*.plush - go.mod - go.sum -======= - - uses: actions/checkout@v4 ->>>>>>> 294ec4d5 (ci: always run ci (#4334)) - - uses: actions/setup-go@v4 - if: env.GIT_DIFF with: go-version-file: go.mod cache: false - uses: golangci/golangci-lint-action@v3 - if: env.GIT_DIFF with: version: v1.54.2 install-mode: goinstall diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2984aff192..c1e78797ce 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,33 +20,17 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] steps: -<<<<<<< HEAD - uses: actions/checkout@v3.4.0 - - uses: technote-space/get-diff-action@v6.1.2 - with: - PATTERNS: | - **/*.go - **/*.plush - go.mod - go.sum - **/testdata/** -======= - - uses: actions/checkout@v4 ->>>>>>> 294ec4d5 (ci: always run ci (#4334)) - - uses: actions/setup-go@v4 - if: env.GIT_DIFF with: go-version: "1.21" cache: true cache-dependency-path: go.sum - run: ./scripts/test-coverage - if: env.GIT_DIFF - name: Upload coverage to Codecov uses: codecov/codecov-action@v3.1.1 - if: env.GIT_DIFF with: file: ./coverage.txt fail_ci_if_error: false