From 0853ca4b4dde906c4bb6c1e64e049661cbae4561 Mon Sep 17 00:00:00 2001 From: "Mauricio A. Rovira Galvez" <8482308+marovira@users.noreply.github.com> Date: Sun, 8 Sep 2024 09:22:10 -0700 Subject: [PATCH] [brief] Fixing the CI script again. [detailed] - Consolidates it back, but this time adding the proper dependency to the formatting step. - Ensure Linux runs on Ubuntu 24.04. --- .github/workflows/build.yml | 27 ++++++++++++++++++++++++--- .github/workflows/tests.yml | 29 ----------------------------- 2 files changed, 24 insertions(+), 32 deletions(-) delete mode 100644 .github/workflows/tests.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 96528cb..2e8497f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,20 +1,41 @@ name: Build on: - workflow_call: + push: + branches: [ master ] + paths-ignore: + - '**.md' + - '**.rst' + - 'LICENSE' + - 'data/**' + - '**/release-*.yml' + tags-ignore: + - "*.*.*" + pull_request: + branches: [ master ] + paths-ignore: + - '**.md' + - '**.rst' + - 'LICENSE' + - '**/release-*.yml' + tags-ignore: + - "*.*.*" workflow_dispatch: jobs: + format: + uses: ./.github/workflows/clang-format.yml build: name: ${{ matrix.config.os }}-${{ matrix.config.preset }} runs-on: ${{ matrix.config.os }} + needs: format strategy: fail-fast: false matrix: config: - {os: "windows-latest", cxx: "msvc", cc: "msvc", preset: "msvc"} - - {os: "ubuntu-latest", cxx: "clang++-18", cc: "clang-18", preset: "clang"} - - {os: "ubuntu-latest", cxx: "gcc-14", cc: "gcc-14", preset: "gcc"} + - {os: "ubuntu-24.04", cxx: "clang++-18", cc: "clang-18", preset: "clang"} + - {os: "ubuntu-24.04", cxx: "gcc-14", cc: "gcc-14", preset: "gcc"} build: ["Debug", "Release"] steps: - name: Chekout diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml deleted file mode 100644 index f800d6c..0000000 --- a/.github/workflows/tests.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Tests - -on: - push: - branches: [ master ] - paths-ignore: - - '**.md' - - '**.rst' - - 'LICENSE' - - 'data/**' - - '**/release-*.yml' - tags-ignore: - - "*.*.*" - pull_request: - branches: [ master ] - paths-ignore: - - '**.md' - - '**.rst' - - 'LICENSE' - - '**/release-*.yml' - tags-ignore: - - "*.*.*" - workflow_dispatch: - -jobs: - format: - uses: ./.github/workflows/clang-format.yml - build: - uses: ./.github/workflows/build.yml