From a3f6ae70f66bc09cb2c6e7cff9619f9965b64872 Mon Sep 17 00:00:00 2001 From: Big Andy <8012398+big-andy-coates@users.noreply.github.com> Date: Tue, 10 Oct 2023 09:56:07 +0100 Subject: [PATCH] fix pandoc installation --- .github/workflows/run-func-test.yml | 6 ++++++ .github/workflows/run-perf-test.yml | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-func-test.yml b/.github/workflows/run-func-test.yml index 33b07e1..087d718 100644 --- a/.github/workflows/run-func-test.yml +++ b/.github/workflows/run-func-test.yml @@ -4,6 +4,12 @@ name: Func Test on: workflow_dispatch: + push: + branches: [ main ] + +concurrency: + group: ${{ github.ref }}-func-test + cancel-in-progress: true permissions: contents: read diff --git a/.github/workflows/run-perf-test.yml b/.github/workflows/run-perf-test.yml index 41ac29c..d1a6cfb 100644 --- a/.github/workflows/run-perf-test.yml +++ b/.github/workflows/run-perf-test.yml @@ -4,11 +4,16 @@ name: Perf Test on: workflow_dispatch: -# Todo: remove this and add one tht runs on merge to main, killing any previous. -#todo: same for func test. + push: + branches: [ main ] +# Todo: remove this, pull_request: branches: [ main ] +concurrency: + group: ${{ github.ref }}-perf-test + cancel-in-progress: true + permissions: contents: read @@ -26,7 +31,7 @@ jobs: - name: Install pandoc # used for latex to markdown conversion run: | # todo: drop this. sudo apt-get update - sudo apt-get pandoc + sudo apt-get haskell-platform - name: Setup Gradle uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0 with: