diff --git a/github-actions/ci-scripts-build.yml.example-full b/github-actions/ci-scripts-build.yml.example-full index e11ee4e..cde9579 100644 --- a/github-actions/ci-scripts-build.yml.example-full +++ b/github-actions/ci-scripts-build.yml.example-full @@ -41,113 +41,57 @@ jobs: matrix: # Job names also name artifacts, character limitations apply include: - - os: ubuntu-20.04 + - os: ubuntu-24.04 cmp: gcc configuration: default wine: "64" - name: "Ub-20 gcc-9 + MinGW" + name: "Ub-24 gcc + MinGW" - - os: ubuntu-20.04 + - os: ubuntu-24.04 cmp: gcc configuration: static wine: "64" - name: "Ub-20 gcc-9 + MinGW, static" + name: "Ub-24 gcc + MinGW, static" - - os: ubuntu-20.04 + - os: ubuntu-24.04 cmp: gcc configuration: static extra: "CMD_CXXFLAGS=-std=c++11" - name: "Ub-20 gcc-9 C++11, static" + name: "Ub-24 gcc C++11, static" - - os: ubuntu-18.04 - cmp: clang - configuration: default - name: "Ub-18 clang-9" - - - os: ubuntu-20.04 + - os: ubuntu-24.04 cmp: clang configuration: default extra: "CMD_CXXFLAGS=-std=c++11" - name: "Ub-20 clang-10 C++11" + name: "Ub-24 clang C++11" - - os: ubuntu-20.04 + - os: ubuntu-22.04 cmp: gcc configuration: default - rtems: "4.10" - name: "Ub-20 gcc-9 + RT-4.10" + cross: "RTEMS-pc686-qemu@5" + name: "Ub-22 gcc + RT-5.1 pc686" - - os: ubuntu-20.04 + - os: ubuntu-22.04 cmp: gcc configuration: default - rtems: "4.9" - name: "Ub-20 gcc-9 + RT-4.9" - - - os: ubuntu-20.04 - cmp: gcc - configuration: default - rtems: "5" - rtems_target: RTEMS-pc686-qemu - name: "Ub-20 gcc-9 + RT-5.1 pc686" - - - os: ubuntu-20.04 - cmp: gcc - configuration: default - rtems: "5" - rtems_target: RTEMS-beatnik + cross: "RTEMS-beatnik@5" test: NO - name: "Ub-20 gcc-9 + RT-5.1 beatnik" + name: "Ub-22 gcc + RT-5.1 beatnik" - - os: ubuntu-18.04 + - os: macos-latest + cmp: clang + configuration: default + name: "MacOS clang" + + - os: windows-2022 cmp: gcc configuration: default - name: "Ub-18 gcc-7" + name: "Win2022 MinGW" - - os: ubuntu-18.04 - cmp: gcc-8 - utoolchain: true - configuration: default - name: "Ub-18 gcc-8" - - - os: ubuntu-20.04 - cmp: gcc-8 - utoolchain: true - configuration: default - name: "Ub-20 gcc-8" - - - os: ubuntu-20.04 - cmp: clang - configuration: default - name: "Ub-20 clang-10" - - - os: macos-11 - cmp: clang - configuration: default - name: "MacOS clang-13" - - - os: macos-12 - cmp: clang - configuration: default - name: "MacOS clang-13" - - - os: windows-2019 - cmp: gcc - configuration: default - name: "Win2019 MinGW" - - - os: windows-2019 + - os: windows-2022 cmp: gcc configuration: static - name: "Win2019 MinGW, static" - - - os: windows-2019 - cmp: vs2019 - configuration: default - name: "Win2019 MSC-19" - - - os: windows-2019 - cmp: vs2019 - configuration: static - name: "Win2019 MSC-19, static" + name: "Win2022 MinGW, static" - os: windows-2022 cmp: vs2022 @@ -159,8 +103,14 @@ jobs: configuration: static name: "Win2022 MSC-22, static" + - os: ubuntu-latest + cmp: gcc + configuration: default + name: "Cross linux-aarch64" + cross: linux-aarch64 + steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true - name: Automatic core dumper analysis @@ -170,13 +120,6 @@ jobs: sudo apt-get update sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb if: runner.os == 'Linux' - - name: "apt-get install ${{ matrix.cmp }}" - run: | - sudo apt-get -y install software-properties-common - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo apt-get update - sudo apt-get -y install ${{ matrix.cmp }} - if: matrix.utoolchain - name: Prepare and compile dependencies run: python .ci/cue.py prepare - name: Build main module @@ -184,44 +127,10 @@ jobs: - name: Run main module tests run: python .ci/cue.py -T 15M test - name: Upload tapfiles Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: tapfiles ${{ matrix.name }} path: '**/O.*/*.tap' - name: Collect and show test results - run: python .ci/cue.py test-results - - build-cross: - name: cross ${{ matrix.cross }} / ${{ matrix.cmp }} / ${{ matrix.configuration }} - runs-on: ubuntu-20.04 - env: - CMP: gcc - BCFG: default - CI_CROSS_TARGETS: ${{ matrix.cross }} - APT: re2c - strategy: - fail-fast: false - matrix: - # configuration: [default, static, debug, static-debug] - configuration: [default] - cross: - - linux-aarch64 - - linux-arm@arm-linux-gnueabi - - linux-arm@arm-linux-gnueabihf - - linux-ppc - - linux-ppc64 - - win32-x86-mingw - - windows-x64-mingw - - RTEMS-pc386-qemu@4.9 - - RTEMS-pc386-qemu@4.10 - - RTEMS-pc686-qemu@5 - steps: - - uses: actions/checkout@v3 - - name: Prepare and compile dependencies - run: python cue.py prepare - - name: Build main module - run: python cue.py build - - name: Run main module tests - run: python cue.py -T 15M test - - name: Collect and show test results - run: python cue.py test-results + if: ${{ always() }} + run: python .ci/cue.py -T 5M test-results diff --git a/github-actions/ci-scripts-build.yml.example-mini b/github-actions/ci-scripts-build.yml.example-mini index a021cbf..2d986c4 100644 --- a/github-actions/ci-scripts-build.yml.example-mini +++ b/github-actions/ci-scripts-build.yml.example-mini @@ -32,44 +32,38 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-18.04 - cmp: gcc - configuration: default - base: "7.0" - name: "7.0 Ub-18 gcc-7" - - - os: ubuntu-18.04 - cmp: gcc - configuration: static - base: "7.0" - name: "7.0 Ub-18 gcc-7 static" - - - os: ubuntu-20.04 + - os: ubuntu-24.04 cmp: gcc configuration: default base: "3.15" - name: "3.15 Ub-20 gcc-9" + name: "3.15 Ub-24 gcc" - - os: ubuntu-20.04 + - os: ubuntu-24.04 + cmp: gcc + configuration: default + base: "7.0" + name: "7.0 Ub-24 gcc" + + - os: ubuntu-24.04 cmp: gcc configuration: static base: "3.15" - name: "3.15 Ub-20 gcc-9 static" + name: "3.15 Ub-24 gcc static" - - os: ubuntu-20.04 + - os: ubuntu-24.04 cmp: gcc configuration: debug base: "3.15" - name: "3.15 Ub-20 gcc-9 debug" + name: "3.15 Ub-24 gcc debug" - - os: ubuntu-20.04 + - os: ubuntu-24.04 cmp: clang configuration: default base: "3.15" - name: "3.15 Ub-20 clang-10" + name: "3.15 Ub-24 clang" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true - name: Prepare and compile dependencies