From 03a375ac82ccc3a375afe44582b8ba5d2c2a3a09 Mon Sep 17 00:00:00 2001 From: Jiquan Long Date: Sun, 7 Jan 2024 20:06:51 +0800 Subject: [PATCH] enhance: [skip-e2e] auto cancel stale workflows (#29145) (#29193) /kind improvement pr: #29145 --------- Signed-off-by: longjiquan --- .github/workflows/code-checker.yaml | 4 ++++ .github/workflows/mac.yaml | 4 ++++ .github/workflows/main.yaml | 4 ++++ .github/workflows/publish-builder.yaml | 4 ++++ .github/workflows/publish-gpu-builder.yaml | 4 ++++ .github/workflows/publish-krte-images.yaml | 4 ++++ .github/workflows/publish-test-images.yaml | 4 ++++ build/docker/builder/cpu/amazonlinux2023/Dockerfile | 3 ++- 8 files changed, 30 insertions(+), 1 deletion(-) diff --git a/.github/workflows/code-checker.yaml b/.github/workflows/code-checker.yaml index d4f4416745..1637baf8a4 100644 --- a/.github/workflows/code-checker.yaml +++ b/.github/workflows/code-checker.yaml @@ -27,6 +27,10 @@ on: - .golangci.yml - rules.go +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: ubuntu: name: Code Checker AMD64 Ubuntu 20.04 diff --git a/.github/workflows/mac.yaml b/.github/workflows/mac.yaml index 196c7edabc..28332eec17 100644 --- a/.github/workflows/mac.yaml +++ b/.github/workflows/mac.yaml @@ -24,6 +24,10 @@ on: - go.mod - go.sum +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: mac: name: Code Checker MacOS 12 diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 861193cd1b..09015fee32 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -35,6 +35,10 @@ on: - '!**.md' - '!build/ci/jenkins/**' +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: Build: name: Build and test AMD64 Ubuntu ${{ matrix.ubuntu }} diff --git a/.github/workflows/publish-builder.yaml b/.github/workflows/publish-builder.yaml index 6e85a103c4..ea4f9306a8 100644 --- a/.github/workflows/publish-builder.yaml +++ b/.github/workflows/publish-builder.yaml @@ -16,6 +16,10 @@ on: - '.github/workflows/publish-builder.yaml' - '!**.md' +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: publish-builder: name: ${{ matrix.arch }} ${{ matrix.os }} diff --git a/.github/workflows/publish-gpu-builder.yaml b/.github/workflows/publish-gpu-builder.yaml index 7778b17a2d..3f552b1bb5 100644 --- a/.github/workflows/publish-gpu-builder.yaml +++ b/.github/workflows/publish-gpu-builder.yaml @@ -16,6 +16,10 @@ on: - '.github/workflows/publish-gpu-builder.yaml' - '!**.md' +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: publish-gpu-builder: name: ${{ matrix.arch }} ${{ matrix.os }} diff --git a/.github/workflows/publish-krte-images.yaml b/.github/workflows/publish-krte-images.yaml index ba4881b653..4fe3e6af7c 100644 --- a/.github/workflows/publish-krte-images.yaml +++ b/.github/workflows/publish-krte-images.yaml @@ -17,6 +17,10 @@ on: - '.github/workflows/publish-krte-images.yaml' - '!**.md' +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: publish-krte-images: name: KRTE diff --git a/.github/workflows/publish-test-images.yaml b/.github/workflows/publish-test-images.yaml index fd6e5ccf84..df8614821a 100644 --- a/.github/workflows/publish-test-images.yaml +++ b/.github/workflows/publish-test-images.yaml @@ -18,6 +18,10 @@ on: - '.github/workflows/publish-test-images.yaml' - '!**.md' +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: publish-pytest-images: name: PyTest diff --git a/build/docker/builder/cpu/amazonlinux2023/Dockerfile b/build/docker/builder/cpu/amazonlinux2023/Dockerfile index 9f7226face..de0fb6b1a8 100644 --- a/build/docker/builder/cpu/amazonlinux2023/Dockerfile +++ b/build/docker/builder/cpu/amazonlinux2023/Dockerfile @@ -23,8 +23,9 @@ RUN pip3 install conan==1.61.0 RUN echo "target arch $TARGETARCH" RUN wget -qO- "https://cmake.org/files/v3.24/cmake-3.24.4-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local +# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md RUN mkdir /opt/vcpkg && \ - wget -qO- vcpkg.tar.gz https://github.com/microsoft/vcpkg/archive/master.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \ + wget -qO- vcpkg.tar.gz https://github.com/microsoft/vcpkg/archive/refs/tags/2023.11.20.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \ rm -rf vcpkg.tar.gz ENV VCPKG_FORCE_SYSTEM_BINARIES 1