Revert "ci: temporarily disable cancel-in-progress in concurrency (#920…

…)" (#921) This reverts commit 4d10576.
rancher · Dec 3, 2021 · ecc3a6c · ecc3a6c
1 parent 4d10576
commit ecc3a6c
Show file tree

Hide file tree

Showing 26 changed files with 78 additions and 156 deletions.
diff --git a/.github/build.yaml.gomplate b/.github/build.yaml.gomplate
@@ -949,12 +949,9 @@ name: {{{$config.pipeline}}}-{{{ $config.flavor }}}-{{{ $config.arch }}}
 on: 
 {{{$config.on | toYAML | indent 1 }}}
 
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-{{{$config.pipeline}}}-{{{ $config.flavor }}}-{{{ $config.arch }}}-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-{{{$config.pipeline}}}-{{{ $config.flavor }}}-{{{ $config.arch }}}-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-{{{$config.pipeline}}}-{{{ $config.flavor }}}-{{{ $config.arch }}}-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 
 jobs:
 {{{- if (has $config "build_examples_dir") }}}

diff --git a/.github/workflows/build-examples-green-x86_64.yaml b/.github/workflows/build-examples-green-x86_64.yaml
@@ -12,12 +12,9 @@ on:
  push:
    branches:
      - master
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-Examples-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-Examples-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-Examples-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   docker-build-example-cos-official:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-master-blue-arm64.yaml b/.github/workflows/build-master-blue-arm64.yaml
@@ -3,12 +3,9 @@ on:
  push:
    branches:
      - master
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-master-blue-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-master-blue-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-master-blue-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   build-blue-arm64:
     runs-on: [self-hosted, arm64]

diff --git a/.github/workflows/build-master-blue-x86_64.yaml b/.github/workflows/build-master-blue-x86_64.yaml
@@ -3,12 +3,9 @@ on:
  push:
    branches:
      - master
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-master-blue-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-master-blue-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-master-blue-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   docker-build-blue:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-master-green-arm64.yaml b/.github/workflows/build-master-green-arm64.yaml
@@ -3,12 +3,9 @@ on:
  push:
    branches:
      - master
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-master-green-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-master-green-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-master-green-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   build-green-arm64:
     runs-on: [self-hosted, arm64]

diff --git a/.github/workflows/build-master-green-x86_64.yaml b/.github/workflows/build-master-green-x86_64.yaml
@@ -3,12 +3,9 @@ on:
  push:
    branches:
      - master
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-master-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-master-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-master-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   docker-build-green:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-master-orange-arm64.yaml b/.github/workflows/build-master-orange-arm64.yaml
@@ -3,12 +3,9 @@ on:
  push:
    branches:
      - master
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-master-orange-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-master-orange-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-master-orange-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   build-orange-arm64:
     runs-on: [self-hosted, arm64]

diff --git a/.github/workflows/build-master-orange-x86_64.yaml b/.github/workflows/build-master-orange-x86_64.yaml
@@ -3,12 +3,9 @@ on:
  push:
    branches:
      - master
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-master-orange-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-master-orange-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-master-orange-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   docker-build-orange:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-nightly-blue-x86_64.yaml b/.github/workflows/build-nightly-blue-x86_64.yaml
@@ -2,12 +2,9 @@ name: nightly-blue-x86_64
 on: 
  schedule:
    - cron: 0 20 * * *
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-nightly-blue-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-nightly-blue-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-nightly-blue-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   docker-build-blue:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-nightly-green-x86_64.yaml b/.github/workflows/build-nightly-green-x86_64.yaml
@@ -2,12 +2,9 @@ name: nightly-green-x86_64
 on: 
  schedule:
    - cron: 0 20 * * *
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-nightly-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-nightly-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-nightly-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   docker-build-green:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-nightly-orange-x86_64.yaml b/.github/workflows/build-nightly-orange-x86_64.yaml
@@ -2,12 +2,9 @@ name: nightly-orange-x86_64
 on: 
  schedule:
    - cron: 0 20 * * *
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-nightly-orange-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-nightly-orange-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-nightly-orange-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   docker-build-orange:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-pr-blue-arm64.yaml b/.github/workflows/build-pr-blue-arm64.yaml
@@ -4,12 +4,9 @@ on:
    types:
      - labeled
      - synchronize
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-PR-blue-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-PR-blue-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-PR-blue-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   build-blue-arm64:
     runs-on: [self-hosted, arm64]

diff --git a/.github/workflows/build-pr-blue-x86_64.yaml b/.github/workflows/build-pr-blue-x86_64.yaml
@@ -8,12 +8,9 @@ on:
      - .github/**
      - Makefile
      - tests/**
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-PR-blue-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-PR-blue-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-PR-blue-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   build-blue-x86_64:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-pr-docker-blue-x86_64.yaml b/.github/workflows/build-pr-docker-blue-x86_64.yaml
@@ -8,12 +8,9 @@ on:
      - .github/**
      - Makefile
      - tests/**
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-docker-blue-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-docker-blue-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-docker-blue-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   docker-build-blue:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-pr-docker-green-x86_64.yaml b/.github/workflows/build-pr-docker-green-x86_64.yaml
@@ -8,12 +8,9 @@ on:
      - .github/**
      - Makefile
      - tests/**
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-docker-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-docker-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-docker-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   docker-build-green:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-pr-docker-orange-x86_64.yaml b/.github/workflows/build-pr-docker-orange-x86_64.yaml
@@ -8,12 +8,9 @@ on:
      - .github/**
      - Makefile
      - tests/**
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-docker-orange-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-docker-orange-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-docker-orange-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   docker-build-orange:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-pr-green-arm64.yaml b/.github/workflows/build-pr-green-arm64.yaml
@@ -4,12 +4,9 @@ on:
    types:
      - labeled
      - synchronize
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-PR-green-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-PR-green-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-PR-green-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   build-green-arm64:
     runs-on: [self-hosted, arm64]

diff --git a/.github/workflows/build-pr-green-x86_64.yaml b/.github/workflows/build-pr-green-x86_64.yaml
@@ -8,12 +8,9 @@ on:
      - .github/**
      - Makefile
      - tests/**
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-PR-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-PR-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-PR-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   build-green-x86_64:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-pr-orange-arm64.yaml b/.github/workflows/build-pr-orange-arm64.yaml
@@ -4,12 +4,9 @@ on:
    types:
      - labeled
      - synchronize
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-PR-orange-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-PR-orange-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-PR-orange-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   build-orange-arm64:
     runs-on: [self-hosted, arm64]

diff --git a/.github/workflows/build-pr-orange-x86_64.yaml b/.github/workflows/build-pr-orange-x86_64.yaml
@@ -8,12 +8,9 @@ on:
      - .github/**
      - Makefile
      - tests/**
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-PR-orange-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-PR-orange-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-PR-orange-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   build-orange-x86_64:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-releases-blue-arm64.yaml b/.github/workflows/build-releases-blue-arm64.yaml
@@ -3,12 +3,9 @@ on:
  push:
    tags:
      - v*
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-release-blue-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-release-blue-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-release-blue-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   build-blue-arm64:
     runs-on: [self-hosted, arm64]

diff --git a/.github/workflows/build-releases-blue-x86_64.yaml b/.github/workflows/build-releases-blue-x86_64.yaml
@@ -3,12 +3,9 @@ on:
  push:
    tags:
      - v*
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-release-blue-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-release-blue-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-release-blue-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   docker-build-blue:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-releases-green-arm64.yaml b/.github/workflows/build-releases-green-arm64.yaml
@@ -3,12 +3,9 @@ on:
  push:
    tags:
      - v*
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-release-green-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-release-green-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-release-green-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   build-green-arm64:
     runs-on: [self-hosted, arm64]

diff --git a/.github/workflows/build-releases-green-x86_64.yaml b/.github/workflows/build-releases-green-x86_64.yaml
@@ -3,12 +3,9 @@ on:
  push:
    tags:
      - v*
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-release-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-release-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-release-green-x86_64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   docker-build-green:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build-releases-orange-arm64.yaml b/.github/workflows/build-releases-orange-arm64.yaml
@@ -3,12 +3,9 @@ on:
  push:
    tags:
      - v*
-# See: https://github.com/actions/runner/issues/1532, https://github.uint.cloudmunity/t/breaking-change-to-concurrency-group-syntax/
-# Temporary associate concurrency with a string only
-concurrency: ci-release-orange-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#concurrency:
-#  group: ci-release-orange-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
-#  cancel-in-progress: true
+concurrency:
+  group: ci-release-orange-arm64-${{ github.head_ref || github.ref }}-${{ github.repository }}
+  cancel-in-progress: true
 jobs:
   build-orange-arm64:
     runs-on: [self-hosted, arm64]