diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index cbe329f..0ec50d6 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -42,29 +42,29 @@ jobs: configuration: [default, static, debug, static-debug] base: ["7.0"] include: - - os: ubuntu-24.04 + - name: "B-3.15 Ub-24 gcc-13" + os: ubuntu-24.04 cmp: gcc configuration: default base: "3.15" - name: "B-3.15 Ub-24 gcc-13" - - os: ubuntu-24.04 + - name: "B-3.15 Ub-24 gcc-13, static" + os: ubuntu-24.04 cmp: gcc configuration: static base: "3.15" - name: "B-3.15 Ub-24 gcc-13, static" - - os: ubuntu-24.04 + - name: "B-3.14 Ub-24 gcc-13" + os: ubuntu-24.04 cmp: gcc configuration: default base: "3.14" - name: "B-3.14 Ub-24 gcc-13" - - os: ubuntu-24.04 + - name: "B-3.14 Ub-24 gcc-13, static" + os: ubuntu-24.04 cmp: gcc configuration: static base: "3.14" - name: "B-3.14 Ub-24 gcc-13, static" steps: - uses: actions/checkout@v4 - name: Prepare and compile dependencies @@ -91,18 +91,18 @@ jobs: configuration: [default, debug] base: ["7.0"] include: - - os: macos-15 + - name: "B-3.15 Mac-15" + os: macos-15 cmp: clang configuration: default base: "3.15" - name: "B-3.15 Mac-15" # Base 3.14 does not support MacOS-aarch64 -# - os: macos-15 +# - name: "B-3.14 Mac-15" +# os: macos-15 # cmp: clang # configuration: default # base: "3.14" -# name: "B-3.14 Mac-15" steps: - uses: actions/checkout@v4 - name: Prepare and compile dependencies @@ -129,17 +129,17 @@ jobs: configuration: [default, static, debug, static-debug] base: [ "7.0" ] include: - - os: windows-2025 + - name: "B-3.15 Win-25 MSC-22 static" + os: windows-2025 cmp: vs2022 configuration: static base: "3.15" - name: "B-3.15 Win-25 MSC-22 static" - - os: windows-2025 + - name: "B-3.14 Win-25 MSC-22 static" + os: windows-2025 cmp: vs2022 configuration: static base: "3.14" - name: "B-3.14 Win-25 MSC-22 static" steps: - uses: actions/checkout@v4 - name: Prepare and compile dependencies diff --git a/github-actions/ci-scripts-build.yml.example-full b/github-actions/ci-scripts-build.yml.example-full index cde9579..02723fa 100644 --- a/github-actions/ci-scripts-build.yml.example-full +++ b/github-actions/ci-scripts-build.yml.example-full @@ -31,9 +31,7 @@ jobs: env: CMP: ${{ matrix.cmp }} BCFG: ${{ matrix.configuration }} - WINE: ${{ matrix.wine }} - RTEMS: ${{ matrix.rtems }} - RTEMS_TARGET: ${{ matrix.rtems_target }} + CI_CROSS_TARGETS: ${{ matrix.cross }} EXTRA: ${{ matrix.extra }} TEST: ${{ matrix.test }} strategy: @@ -41,73 +39,75 @@ jobs: matrix: # Job names also name artifacts, character limitations apply include: - - os: ubuntu-24.04 - cmp: gcc + - name: "Ub-24 clang C++11" + os: ubuntu-24.04 + cmp: clang configuration: default - wine: "64" - name: "Ub-24 gcc + MinGW" - - - os: ubuntu-24.04 - cmp: gcc - configuration: static - wine: "64" - name: "Ub-24 gcc + MinGW, static" + extra: "CMD_CXXFLAGS=-std=c++11" - - os: ubuntu-24.04 + - name: "Ub-24 gcc C++11, static" + os: ubuntu-24.04 cmp: gcc configuration: static extra: "CMD_CXXFLAGS=-std=c++11" - name: "Ub-24 gcc C++11, static" - - os: ubuntu-24.04 + - name: "MacOS clang" + os: macos-latest cmp: clang configuration: default - extra: "CMD_CXXFLAGS=-std=c++11" - name: "Ub-24 clang C++11" - - os: ubuntu-22.04 + # Cross builds (cmp=gcc only) + + - name: "Ub-24 gcc + MinGW" + os: ubuntu-24.04 + cmp: gcc + configuration: default + + - name: "Ub-24 gcc + MinGW, static" + os: ubuntu-24.04 + cmp: gcc + configuration: static + + - name: "Ub-22 gcc + RT-5.1 pc686" + os: ubuntu-22.04 cmp: gcc configuration: default cross: "RTEMS-pc686-qemu@5" - name: "Ub-22 gcc + RT-5.1 pc686" - - os: ubuntu-22.04 + - name: "Ub-22 gcc + RT-5.1 beatnik" + os: ubuntu-22.04 cmp: gcc configuration: default cross: "RTEMS-beatnik@5" test: NO - name: "Ub-22 gcc + RT-5.1 beatnik" - - - os: macos-latest - cmp: clang - configuration: default - name: "MacOS clang" - - os: windows-2022 + - name: "Ub gcc + linux-aarch64" + os: ubuntu-latest cmp: gcc configuration: default - name: "Win2022 MinGW" + cross: linux-aarch64 - - os: windows-2022 - cmp: gcc - configuration: static - name: "Win2022 MinGW, static" + # Windows builds - - os: windows-2022 + - name: "Win-22 MSC-22" + os: windows-2022 cmp: vs2022 configuration: default - name: "Win2022 MSC-22" - - os: windows-2022 + - name: "Win-22 MSC-22, static" + os: windows-2022 cmp: vs2022 configuration: static - name: "Win2022 MSC-22, static" - - os: ubuntu-latest + - name: "Win-22 MinGW" + os: windows-2022 cmp: gcc configuration: default - name: "Cross linux-aarch64" - cross: linux-aarch64 + + - name: "Win-22 MinGW, static" + os: windows-2022 + cmp: gcc + configuration: static steps: - uses: actions/checkout@v4 diff --git a/github-actions/ci-scripts-build.yml.example-mini b/github-actions/ci-scripts-build.yml.example-mini index 2d986c4..ae75f99 100644 --- a/github-actions/ci-scripts-build.yml.example-mini +++ b/github-actions/ci-scripts-build.yml.example-mini @@ -31,36 +31,36 @@ jobs: strategy: fail-fast: false matrix: - include: - - os: ubuntu-24.04 - cmp: gcc - configuration: default - base: "3.15" - name: "3.15 Ub-24 gcc" + include: + - name: "3.15 Ub-24 gcc" + os: ubuntu-24.04 + cmp: gcc + configuration: default + base: "3.15" - - os: ubuntu-24.04 - cmp: gcc - configuration: default - base: "7.0" - name: "7.0 Ub-24 gcc" + - name: "7.0 Ub-24 gcc" + os: ubuntu-24.04 + cmp: gcc + configuration: default + base: "7.0" - - os: ubuntu-24.04 - cmp: gcc - configuration: static - base: "3.15" - name: "3.15 Ub-24 gcc static" + - name: "3.15 Ub-24 gcc static" + os: ubuntu-24.04 + cmp: gcc + configuration: static + base: "3.15" - - os: ubuntu-24.04 - cmp: gcc - configuration: debug - base: "3.15" - name: "3.15 Ub-24 gcc debug" + - name: "3.15 Ub-24 gcc debug" + os: ubuntu-24.04 + cmp: gcc + configuration: debug + base: "3.15" - - os: ubuntu-24.04 - cmp: clang - configuration: default - base: "3.15" - name: "3.15 Ub-24 clang" + - name: "3.15 Ub-24 clang" + os: ubuntu-24.04 + cmp: clang + configuration: default + base: "3.15" steps: - uses: actions/checkout@v4