From 8d302aa893c0b27713fd9247ed8b96285ce3a506 Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 9 Nov 2021 08:26:51 +0100 Subject: [PATCH 1/3] Cancel prev runs for bench and nix --- .github/workflows/bench.yml | 5 +++++ .github/workflows/nix.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 48930e1eb1..33279fec4a 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -1,5 +1,10 @@ name: Benchmark +# See: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#concurrency. +concurrency: + group: ${{ github.head_ref }}-${{ github.workflow }} + cancel-in-progress: true + on: pull_request: branches: diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index dce5f9083b..fe6b76f6a5 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -1,5 +1,10 @@ name: Nix +# See: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#concurrency. +concurrency: + group: ${{ github.head_ref }}-${{ github.workflow }} + cancel-in-progress: true + on: pull_request: branches: From d789098c76193d74f6ed7c2f535f9ae0cd748840 Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 9 Nov 2021 09:01:21 +0100 Subject: [PATCH 2/3] Dont use skip-duplicate-actions for cancel others --- .github/workflows/bench.yml | 2 +- .github/workflows/nix.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 33279fec4a..9213a22c2c 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -19,7 +19,7 @@ jobs: - id: skip_check uses: fkirc/skip-duplicate-actions@v3.4.0 with: - cancel_others: true + cancel_others: false paths_ignore: '["**/docs/**", "**.md", "**/LICENSE", ".circleci/**", "install/**", "**.nix", "**/test/**", "flake.lock", "**/README.md", "FUNDING.yml"]' bench_init: diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index fe6b76f6a5..7312cef262 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -23,7 +23,7 @@ jobs: - id: skip_check uses: fkirc/skip-duplicate-actions@master with: - cancel_others: true + cancel_others: false paths_ignore: '["**/docs/**", "**.md", "**/LICENSE", ".circleci/**", "install/**", "**/README.md", "FUNDING.yml"]' - id: skip_check_no_nix uses: fkirc/skip-duplicate-actions@master From a0b44f78ae3eebdf7a9dd2ba995257a11a5a17e1 Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Tue, 9 Nov 2021 13:58:09 +0100 Subject: [PATCH 3/3] Ignore format func-tests --- test/functional/Main.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/Main.hs b/test/functional/Main.hs index c8c1651701..da12500f7f 100644 --- a/test/functional/Main.hs +++ b/test/functional/Main.hs @@ -28,7 +28,7 @@ main = defaultTestRunner , Deferred.tests , Definition.tests , Diagnostic.tests - , Format.tests + , ignoreInEnv [HostOS Windows, GhcVer GHC90] "Tests gets stuck in ci" $ Format.tests , FunctionalBadProject.tests , FunctionalCodeAction.tests , FunctionalLiquid.tests