From 98cfdd84bda68db97e8b73f98ce3325c6ccf2363 Mon Sep 17 00:00:00 2001 From: Souriya Trinh Date: Sat, 14 Sep 2024 23:11:25 +0200 Subject: [PATCH 1/2] [quick ci] Test using a specific tag to filter GitHub ci jobs. --- .github/workflows/coverage.yml | 5 ++++- .github/workflows/ios.yml | 3 +++ .github/workflows/other-arch-isolated.yml | 5 ++++- .github/workflows/other-arch.yml | 3 +++ .github/workflows/ubuntu-3rdparty.yml | 5 ++++- .github/workflows/ubuntu-contrib.yml | 5 ++++- .github/workflows/ubuntu-isolated.yml | 2 +- .github/workflows/ubuntu-ustk.yml | 5 ++++- .github/workflows/ubuntu-venv.yml | 2 +- .github/workflows/windows-clang.yaml | 2 +- .github/workflows/windows-conda.yml | 4 ++-- .github/workflows/windows-msvc.yaml | 2 +- 12 files changed, 32 insertions(+), 11 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 8ad738c251..0e7a2826ea 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -14,7 +14,10 @@ concurrency: cancel-in-progress: true jobs: - build: + build-coverage: + # https://michaelcurrin.github.io/dev-cheatsheets/cheatsheets/ci-cd/github-actions/skip.html + # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/using-conditions-to-control-job-execution + if: ${{ ! contains(github.event.commits[0].message, '[quick ci]') && !contains(github.event.head_commit.message, '[quick ci]') }} runs-on: ubuntu-latest steps: diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index f991347bdf..804d3dd42a 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -15,6 +15,9 @@ concurrency: jobs: build-ios: + # https://michaelcurrin.github.io/dev-cheatsheets/cheatsheets/ci-cd/github-actions/skip.html + # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/using-conditions-to-control-job-execution + if: ${{ ! contains(github.event.commits[0].message, '[quick ci]') && !contains(github.event.head_commit.message, '[quick ci]') }} runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/other-arch-isolated.yml b/.github/workflows/other-arch-isolated.yml index 4592dc6008..236400d624 100644 --- a/.github/workflows/other-arch-isolated.yml +++ b/.github/workflows/other-arch-isolated.yml @@ -15,7 +15,10 @@ concurrency: cancel-in-progress: true jobs: - build-other-architectures: + build-other-architectures-isolated: + # https://michaelcurrin.github.io/dev-cheatsheets/cheatsheets/ci-cd/github-actions/skip.html + # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/using-conditions-to-control-job-execution + if: ${{ ! contains(github.event.commits[0].message, '[quick ci]') && !contains(github.event.head_commit.message, '[quick ci]') }} # The host should always be linux runs-on: ubuntu-22.04 name: Build on ${{ matrix.distro }} ${{ matrix.arch }} ${{ matrix.endianness }} diff --git a/.github/workflows/other-arch.yml b/.github/workflows/other-arch.yml index 3bb2f741bd..5ec19ae48a 100644 --- a/.github/workflows/other-arch.yml +++ b/.github/workflows/other-arch.yml @@ -16,6 +16,9 @@ concurrency: jobs: build-other-architectures: + # https://michaelcurrin.github.io/dev-cheatsheets/cheatsheets/ci-cd/github-actions/skip.html + # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/using-conditions-to-control-job-execution + if: ${{ ! contains(github.event.commits[0].message, '[quick ci]') && !contains(github.event.head_commit.message, '[quick ci]') }} # The host should always be linux runs-on: ubuntu-20.04 name: Build on ${{ matrix.distro }} ${{ matrix.arch }} ${{ matrix.endianness }} diff --git a/.github/workflows/ubuntu-3rdparty.yml b/.github/workflows/ubuntu-3rdparty.yml index ce80687b78..792751245b 100644 --- a/.github/workflows/ubuntu-3rdparty.yml +++ b/.github/workflows/ubuntu-3rdparty.yml @@ -14,7 +14,10 @@ concurrency: cancel-in-progress: true jobs: - build-ubuntu-dep-apt: + build-ubuntu-dep-apt-3rdparty: + # https://michaelcurrin.github.io/dev-cheatsheets/cheatsheets/ci-cd/github-actions/skip.html + # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/using-conditions-to-control-job-execution + if: ${{ ! contains(github.event.commits[0].message, '[quick ci]') && !contains(github.event.head_commit.message, '[quick ci]') }} runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/ubuntu-contrib.yml b/.github/workflows/ubuntu-contrib.yml index f949c14557..2b4423cbff 100644 --- a/.github/workflows/ubuntu-contrib.yml +++ b/.github/workflows/ubuntu-contrib.yml @@ -14,7 +14,10 @@ concurrency: cancel-in-progress: true jobs: - build-ubuntu-dep-apt: + build-ubuntu-dep-apt-contrib: + # https://michaelcurrin.github.io/dev-cheatsheets/cheatsheets/ci-cd/github-actions/skip.html + # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/using-conditions-to-control-job-execution + if: ${{ ! contains(github.event.commits[0].message, '[quick ci]') && !contains(github.event.head_commit.message, '[quick ci]') }} runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/ubuntu-isolated.yml b/.github/workflows/ubuntu-isolated.yml index deb166eadc..82e11feb0c 100644 --- a/.github/workflows/ubuntu-isolated.yml +++ b/.github/workflows/ubuntu-isolated.yml @@ -15,7 +15,7 @@ concurrency: cancel-in-progress: true jobs: - build-ubuntu-dep-apt: + build-ubuntu-dep-apt-isolated: runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/ubuntu-ustk.yml b/.github/workflows/ubuntu-ustk.yml index 2a5a539db6..3e8dd421c9 100644 --- a/.github/workflows/ubuntu-ustk.yml +++ b/.github/workflows/ubuntu-ustk.yml @@ -14,7 +14,10 @@ concurrency: cancel-in-progress: true jobs: - build-ubuntu-dep-apt: + build-ubuntu-dep-apt-ustk: + # https://michaelcurrin.github.io/dev-cheatsheets/cheatsheets/ci-cd/github-actions/skip.html + # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/using-conditions-to-control-job-execution + if: ${{ ! contains(github.event.commits[0].message, '[quick ci]') && !contains(github.event.head_commit.message, '[quick ci]') }} runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/ubuntu-venv.yml b/.github/workflows/ubuntu-venv.yml index e738293c4d..e7f99da60a 100644 --- a/.github/workflows/ubuntu-venv.yml +++ b/.github/workflows/ubuntu-venv.yml @@ -14,7 +14,7 @@ concurrency: cancel-in-progress: true jobs: - build-ubuntu-dep-apt: + build-ubuntu-dep-apt-venv: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/windows-clang.yaml b/.github/workflows/windows-clang.yaml index c80a82dee4..89a455fefb 100644 --- a/.github/workflows/windows-clang.yaml +++ b/.github/workflows/windows-clang.yaml @@ -10,7 +10,7 @@ concurrency: cancel-in-progress: true jobs: - build: + build-windows-clang: runs-on: ${{ matrix.os }} defaults: run: diff --git a/.github/workflows/windows-conda.yml b/.github/workflows/windows-conda.yml index 9f44db81e1..419239bb1b 100644 --- a/.github/workflows/windows-conda.yml +++ b/.github/workflows/windows-conda.yml @@ -8,7 +8,7 @@ concurrency: cancel-in-progress: true jobs: - visp-conda: + build-windows-conda: name: ${{ matrix.os }} ${{ matrix.compiler }} - Python ${{ matrix.python-version }} ${{ matrix.build_type }} ${{ matrix.cxx_options }} runs-on: ${{ matrix.os }} @@ -85,7 +85,7 @@ jobs: name: check-windows-conda needs: - - visp-conda + - build-windows-conda runs-on: Ubuntu-latest diff --git a/.github/workflows/windows-msvc.yaml b/.github/workflows/windows-msvc.yaml index f9f70abf51..787902b96b 100644 --- a/.github/workflows/windows-msvc.yaml +++ b/.github/workflows/windows-msvc.yaml @@ -10,7 +10,7 @@ concurrency: cancel-in-progress: true jobs: - build: + build-windows-msvc: runs-on: ${{ matrix.os }} defaults: run: From 117130a64125ec1fe81bb57188368d5a99767747 Mon Sep 17 00:00:00 2001 From: Souriya Trinh Date: Sun, 15 Sep 2024 01:41:17 +0200 Subject: [PATCH 2/2] [quick ci] Test RISC-V architecture. --- .github/workflows/other-arch-isolated.yml | 12 ++++-------- .github/workflows/ubuntu-dep-apt.yml | 3 +++ .github/workflows/ubuntu-dep-src.yml | 3 +++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/other-arch-isolated.yml b/.github/workflows/other-arch-isolated.yml index 236400d624..fe2d8396c0 100644 --- a/.github/workflows/other-arch-isolated.yml +++ b/.github/workflows/other-arch-isolated.yml @@ -16,9 +16,6 @@ concurrency: jobs: build-other-architectures-isolated: - # https://michaelcurrin.github.io/dev-cheatsheets/cheatsheets/ci-cd/github-actions/skip.html - # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/using-conditions-to-control-job-execution - if: ${{ ! contains(github.event.commits[0].message, '[quick ci]') && !contains(github.event.head_commit.message, '[quick ci]') }} # The host should always be linux runs-on: ubuntu-22.04 name: Build on ${{ matrix.distro }} ${{ matrix.arch }} ${{ matrix.endianness }} @@ -33,19 +30,18 @@ jobs: # target: ARMV6 - arch: armv7 distro: ubuntu22.04 - target: ARMV7 endianness: (Little Endian) - arch: aarch64 distro: ubuntu22.04 #fedora_latest - target: ARMV8 + endianness: (Little Endian) + - arch: riscv64 + distro: ubuntu_latest endianness: (Little Endian) - arch: ppc64le distro: ubuntu22.04 - target: POWER8 endianness: (Little Endian) - arch: s390x distro: ubuntu22.04 - target: Z13 endianness: (Big Endian) steps: @@ -53,7 +49,7 @@ jobs: uses: actions/checkout@v4 - name: Run on arch - uses: uraimo/run-on-arch-action@v2.2.1 + uses: uraimo/run-on-arch-action@v2.7.2 with: githubToken: ${{ github.token }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/ubuntu-dep-apt.yml b/.github/workflows/ubuntu-dep-apt.yml index a6d23f30dd..6bd4d66786 100644 --- a/.github/workflows/ubuntu-dep-apt.yml +++ b/.github/workflows/ubuntu-dep-apt.yml @@ -14,6 +14,9 @@ concurrency: cancel-in-progress: true jobs: + # https://michaelcurrin.github.io/dev-cheatsheets/cheatsheets/ci-cd/github-actions/skip.html + # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/using-conditions-to-control-job-execution + if: ${{ ! contains(github.event.commits[0].message, '[quick ci]') && !contains(github.event.head_commit.message, '[quick ci]') }} build-ubuntu-dep-apt: runs-on: ${{ matrix.os }} strategy: diff --git a/.github/workflows/ubuntu-dep-src.yml b/.github/workflows/ubuntu-dep-src.yml index 8132a7216d..677ec0cbad 100644 --- a/.github/workflows/ubuntu-dep-src.yml +++ b/.github/workflows/ubuntu-dep-src.yml @@ -19,6 +19,9 @@ env: jobs: build-ubuntu-dep-src: + # https://michaelcurrin.github.io/dev-cheatsheets/cheatsheets/ci-cd/github-actions/skip.html + # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/using-conditions-to-control-job-execution + if: ${{ ! contains(github.event.commits[0].message, '[quick ci]') && !contains(github.event.head_commit.message, '[quick ci]') }} runs-on: ${{ matrix.os }} strategy: fail-fast: false