From 00cd7c8094547469b6750ba914406d30211091cc Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Thu, 16 Dec 2021 20:17:37 +0100 Subject: [PATCH 1/7] Wait for cancellation To hopefully ensure the job does no terminate succesfully before the cancellation is effective --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cb6384b51b..8bb4dc6275 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -264,3 +264,5 @@ jobs: - if: contains(needs.*.result, 'cancelled') name: cancelling uses: andymckay/cancel-action@0.2 + - name: Waiting for cancellation + run: sleep 60 From 8e7ca0e87b3c54207f9658e498118a26960a3d87 Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Fri, 17 Dec 2021 08:23:13 +0100 Subject: [PATCH 2/7] cancel wait in bench --- .github/workflows/bench.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index dd73fc23c5..5646c2c051 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -206,3 +206,5 @@ jobs: - if: contains(needs.*.result, 'cancelled') name: cancelling uses: andymckay/cancel-action@0.2 + - name: Waiting for cancellation + run: sleep 60 From f16773ad64b5945d823eb35425c9788dbf5ac18b Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Fri, 17 Dec 2021 08:23:52 +0100 Subject: [PATCH 3/7] cancel wait in nix --- .github/workflows/nix.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 09d297d3a9..d34eddb564 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -117,3 +117,5 @@ jobs: - if: contains(needs.*.result, 'cancelled') name: cancelling uses: andymckay/cancel-action@0.2 + - name: Waiting for cancellation + run: sleep 60 From 1d5de82d616336bfd6a4bb520dadf9649f40657d Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Fri, 17 Dec 2021 08:35:09 +0100 Subject: [PATCH 4/7] Fail if cancelled and should not --- .github/workflows/test.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8bb4dc6275..78658238bd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -261,8 +261,5 @@ jobs: echo "jobs info: ${{ toJSON(needs) }}" - if: contains(needs.*.result, 'failure') run: exit 1 - - if: contains(needs.*.result, 'cancelled') - name: cancelling - uses: andymckay/cancel-action@0.2 - - name: Waiting for cancellation - run: sleep 60 + - if: contains(needs.*.result, 'cancelled') && needs.pre_job.outputs.should_skip != 'true' + run: exit 1 From b203b8ac93dfecd2cb07dc04773f9e25bfe1cbc9 Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Fri, 17 Dec 2021 08:35:45 +0100 Subject: [PATCH 5/7] Fail if cancelled for bench --- .github/workflows/nix.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index d34eddb564..f6f05afc15 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -114,8 +114,5 @@ jobs: echo "jobs info: ${{ toJSON(needs) }}" - if: contains(needs.*.result, 'failure') run: exit 1 - - if: contains(needs.*.result, 'cancelled') - name: cancelling - uses: andymckay/cancel-action@0.2 - - name: Waiting for cancellation - run: sleep 60 + - if: contains(needs.*.result, 'cancelled') && needs.pre_job.outputs.should_skip != 'true' + run: exit 1 From 8d0b9c03e133222fd3a2bb8cb39331bf23c7c07d Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Fri, 17 Dec 2021 08:36:39 +0100 Subject: [PATCH 6/7] Fail if cancelled for bench --- .github/workflows/bench.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 5646c2c051..e38416eb10 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -203,8 +203,5 @@ jobs: echo "jobs info: ${{ toJSON(needs) }}" - if: contains(needs.*.result, 'failure') run: exit 1 - - if: contains(needs.*.result, 'cancelled') - name: cancelling - uses: andymckay/cancel-action@0.2 - - name: Waiting for cancellation - run: sleep 60 + - if: contains(needs.*.result, 'cancelled') && needs.pre_job.outputs.should_skip != 'true' + run: exit 1 From a08cd5eea20b33e9c76230aa1679fd6ffbdae96a Mon Sep 17 00:00:00 2001 From: Javier Neira Date: Fri, 17 Dec 2021 08:47:37 +0100 Subject: [PATCH 7/7] test doc change To check https://github.com/haskell/haskell-language-server/pull/2493 --- docs/index.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/index.rst b/docs/index.rst index b8c2405762..c6bc4710f0 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -12,3 +12,5 @@ Official haskell ide support via language server (LSP). Successor of `ghcide