From 72c4dc5813b6e0806837f277fdbb5af00224dfa6 Mon Sep 17 00:00:00 2001 From: Wade Barnes Date: Fri, 26 Apr 2024 13:11:52 -0700 Subject: [PATCH] Fix plenum build image - Also set concurrency rules on PR and Push workflows. - Cancel in progress runs when stating a new one. Signed-off-by: Wade Barnes --- .github/workflows/PR.yaml | 4 ++++ .github/workflows/Push.yaml | 4 ++++ .github/workflows/build/Dockerfile.ubuntu-2204 | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/PR.yaml b/.github/workflows/PR.yaml index 50113581a..bd3df6ffe 100644 --- a/.github/workflows/PR.yaml +++ b/.github/workflows/PR.yaml @@ -9,6 +9,10 @@ on: - main - ubuntu-22.04 +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: workflow-setup: name: Initialize Workflow diff --git a/.github/workflows/Push.yaml b/.github/workflows/Push.yaml index e5101b28a..6356ae3d5 100644 --- a/.github/workflows/Push.yaml +++ b/.github/workflows/Push.yaml @@ -10,6 +10,10 @@ on: - 'build-scripts/**' - 'bump_version.sh' +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: workflow-setup: name: Initialize Workflow diff --git a/.github/workflows/build/Dockerfile.ubuntu-2204 b/.github/workflows/build/Dockerfile.ubuntu-2204 index 614eb0623..318bdd0c2 100644 --- a/.github/workflows/build/Dockerfile.ubuntu-2204 +++ b/.github/workflows/build/Dockerfile.ubuntu-2204 @@ -33,7 +33,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61 && RUN echo "deb https://hyperledger.jfrog.io/artifactory/indy jammy dev" >> /etc/apt/sources.list && \ echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list && \ echo "deb https://repo.sovrin.org/deb bionic master" >> /etc/apt/sources.list && \ - echo "deb https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.listst + echo "deb https://repo.sovrin.org/sdk/deb bionic master" >> /etc/apt/sources.list RUN apt-get update -y && apt-get install -y \ # Python