Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .devcontainer/ubuntu-24.04/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM ubuntu:24.04

ARG CMAKE_VERSION="3.26.4"

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get -y install \
build-essential \
curl \
gdb \
less \
ninja-build \
git

RUN curl -L -o cmake.tgz https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-$(arch).tar.gz && \
tar -xf cmake.tgz -C /opt && \
mv /opt/cmake-${CMAKE_VERSION}-linux-$(arch) /opt/cmake-${CMAKE_VERSION}

ENV PATH=$PATH:/opt/cmake-${CMAKE_VERSION}/bin

CMD ["/bin/bash"]
13 changes: 13 additions & 0 deletions .devcontainer/ubuntu-24.04/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "Ubuntu-24.04",
"build": { "dockerfile": "Dockerfile" },

"customizations": {
"vscode": {
"extensions": [
"ms-vscode.cpptools",
"ms-vscode.cpptools-extension-pack"
]
}
}
}
5 changes: 5 additions & 0 deletions .github/.cppcheck_suppressions
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# we are not calling these methods directly
# false positive
unusedFunction:libs/xmltree/src/XMLTree.cpp:47
unusedFunction:libs/xmlschemachecker/src/XmlErrorHandler.cpp:17
unusedFunction:libs/xmlschemachecker/src/XmlErrorHandler.cpp:22
unusedFunction:libs/xmlschemachecker/src/XmlErrorHandler.cpp:27
unusedFunction:libs/xmlschemachecker/src/XmlErrorHandler.cpp:32
unusedFunction:libs/ymltree/src/YmlTreeParserInterface.h:56
unusedFunction:tools/ctrace/src/decode/OpenCsdPacketCollector.cpp:141
unusedFunction:tools/ctrace/src/decode/OpenCsdPacketCollector.cpp:177
unusedFunction:tools/projmgr/src/ProjMgrRpcServer.cpp
4 changes: 2 additions & 2 deletions .github/matrix_includes_buildmgr.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"runOn": "publicRepo"
},
{
"runs_on":"ubuntu-22.04",
"runs_on":"ubuntu-24.04",
"target":"linux",
"arch": "amd64",
"binary_extension":".lin-amd64",
Expand All @@ -20,7 +20,7 @@
"runOn": "always"
},
{
"runs_on":"ubuntu-22.04",
"runs_on":"ubuntu-24.04",
"target":"linux",
"arch": "arm64",
"binary_extension":".lin-arm64",
Expand Down
4 changes: 2 additions & 2 deletions .github/matrix_includes_ctrace.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
"runOn": "publicRepo"
},
{
"runs_on":"ubuntu-22.04",
"runs_on":"ubuntu-24.04",
"target":"linux",
"arch": "amd64",
"binary": "ctrace",
"runOn": "always"
},
{
"runs_on":"ubuntu-22.04",
"runs_on":"ubuntu-24.04",
"target":"linux",
"arch": "arm64",
"binary": "ctrace",
Expand Down
4 changes: 2 additions & 2 deletions .github/matrix_includes_packchk.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
"binary": "packchk"
},
{
"runs_on":"ubuntu-22.04",
"runs_on":"ubuntu-24.04",
"target":"linux",
"arch": "amd64",
"runOn": "always",
"binary": "packchk"
},
{
"runs_on":"ubuntu-22.04",
"runs_on":"ubuntu-24.04",
"target":"linux",
"arch": "arm64",
"runOn": "always",
Expand Down
4 changes: 2 additions & 2 deletions .github/matrix_includes_packgen.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
"runOn": "publicRepo"
},
{
"runs_on":"ubuntu-22.04",
"runs_on":"ubuntu-24.04",
"target":"linux",
"arch": "amd64",
"binary": "packgen",
"runOn": "always"
},
{
"runs_on":"ubuntu-22.04",
"runs_on":"ubuntu-24.04",
"target":"linux",
"arch": "arm64",
"binary": "packgen",
Expand Down
4 changes: 2 additions & 2 deletions .github/matrix_includes_projmgr.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"goswig": false
},
{
"runs_on":"ubuntu-22.04",
"runs_on":"ubuntu-24.04",
"target":"linux",
"arch": "amd64",
"binary": "csolution",
Expand All @@ -18,7 +18,7 @@
"goswig": true
},
{
"runs_on":"ubuntu-22.04",
"runs_on":"ubuntu-24.04",
"target":"linux",
"arch": "arm64",
"binary": "csolution",
Expand Down
4 changes: 2 additions & 2 deletions .github/matrix_includes_svdconv.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
"binary": "svdconv"
},
{
"runs_on":"ubuntu-22.04",
"runs_on":"ubuntu-24.04",
"target":"linux",
"arch": "amd64",
"runOn": "always",
"binary": "svdconv"
},
{
"runs_on":"ubuntu-22.04",
"runs_on":"ubuntu-24.04",
"target":"linux",
"arch": "arm64",
"runOn": "always",
Expand Down
4 changes: 2 additions & 2 deletions .github/matrix_includes_test_libs.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
"runOn": "publicRepo"
},
{
"runs_on":"ubuntu-22.04",
"runs_on":"ubuntu-24.04",
"target":"linux",
"arch": "amd64",
"runOn": "always"
},
{
"runs_on":"ubuntu-22.04",
"runs_on":"ubuntu-24.04",
"target":"linux",
"arch": "arm64",
"runOn": "always"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/buildmgr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
(github.event_name == 'push') ||
(github.event_name == 'release' && startsWith(github.ref, 'refs/tags/tools/buildmgr/')) ||
((github.event.schedule != '') && (!github.event.repository.private))
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 25
permissions:
contents: write
Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:
create_installer:
needs: [ setup, build, docs ]
# Debian package generation in ubuntu 22.04 produces incompatible metadata
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 25
permissions:
contents: write
Expand Down Expand Up @@ -501,7 +501,7 @@ jobs:
GCC_TOOLCHAIN_ROOT: ${{ github.workspace }}/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi/bin
GCC_TOOLCHAIN_10_3_1: ${{ github.workspace }}/${{ matrix.toolchain_root }}
AC6_TOOLCHAIN_6_18_0: ${{ github.workspace }}/${{ matrix.toolchain_root }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 25

steps:
Expand Down Expand Up @@ -666,7 +666,7 @@ jobs:
sanity-check-docker:
needs: create_installer
timeout-minutes: 25
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
container:
image: ${{ matrix.image }}
env:
Expand Down Expand Up @@ -713,7 +713,7 @@ jobs:
name: "Publish Tests Results"
if: ${{ always() }}
needs: [ test ]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Harden Runner
if: ${{ !github.event.repository.private }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cpp-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

lint:
name: cppcheck
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Harden Runner
Expand All @@ -52,7 +52,7 @@ jobs:
--library=.github/cppcheck_googletest.cfg --suppressions-list=.github/.cppcheck_suppressions \
--force -i./external --language=c++ --max-ctu-depth=20 \
--platform=unix64 --std=c++17 --verbose --std=c++17 \
-i./tools/buildmgr/test -i./tools/packchk/test \
-i./tools/buildmgr -i./tools/packchk/test \
-i./tools/ctrace/test \
-i./tools/packgen/test -i./tools/projmgr/test \
-i./tools/svdconv/test -i./test \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ctrace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
github.event_name == 'release' &&
startsWith(github.ref, 'refs/tags/tools/ctrace/')
needs: [ build, test, coverage ]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 25
permissions:
contents: write
Expand Down Expand Up @@ -242,7 +242,7 @@ jobs:
lcov_base: https://github.com/linux-test-project/lcov/releases/download/v1.15
lcov_installer: lcov-1.15.tar.gz
lcov_sha256: c1cda2fa33bec9aa2c2c73c87226cfe97de0831887176b45ee523c5e30f8053a
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 25
steps:
- name: Harden Runner
Expand Down Expand Up @@ -348,7 +348,7 @@ jobs:
# A dependent reporting job is otherwise skipped after a test failure.
if: ${{ always() }}
needs: [ test ]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Harden Runner
if: ${{ !github.event.repository.private }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/global.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
copyright:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Harden Runner
if: ${{ !github.event.repository.private }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:

coverage:
if: github.repository == 'Open-CMSIS-Pack/devtools'
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: [ buildmgr, ctrace, packchk, packgen, projmgr, svdconv, test_libs ]

steps:
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
publish-test-results:
if: always() && github.repository == 'Open-CMSIS-Pack/devtools'
name: Publish Test Results
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: [ buildmgr, ctrace, packchk, packgen, projmgr, svdconv, test_libs ]
permissions:
checks: write
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/packchk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ jobs:
env:
lcov_base: https://github.com/linux-test-project/lcov/releases/download/v1.15/
lcov_installer: lcov-1.15.tar.gz
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 25
steps:
- name: Harden Runner
Expand Down Expand Up @@ -338,7 +338,7 @@ jobs:
github.event_name == 'release' &&
startsWith(github.ref, 'refs/tags/tools/packchk/')
needs: [ build, test, coverage ]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 25
permissions:
contents: write
Expand Down Expand Up @@ -373,7 +373,7 @@ jobs:
name: "Publish Tests Results"
if: ${{ always() }}
needs: [ test ]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Harden Runner
if: ${{ !github.event.repository.private }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/packgen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
github.event_name == 'release' &&
startsWith(github.ref, 'refs/tags/tools/packgen/')
needs: [ build, unittest ]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 25
permissions:
contents: write
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
env:
lcov_base: https://github.com/linux-test-project/lcov/releases/download/v1.15/
lcov_installer: lcov-1.15.tar.gz
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 25
steps:
- name: Harden Runner
Expand Down Expand Up @@ -324,7 +324,7 @@ jobs:
name: "Publish Tests Results"
if: ${{ always() }}
needs: [ unittest ]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Harden Runner
if: ${{ !github.event.repository.private }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/projmgr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ jobs:
github.event_name == 'release' &&
startsWith(github.ref, 'refs/tags/tools/projmgr/')
needs: [ build, build-swig, unittest, coverage ]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 25
permissions:
contents: write
Expand Down Expand Up @@ -403,7 +403,7 @@ jobs:
env:
lcov_base: https://github.com/linux-test-project/lcov/releases/download/v1.15/
lcov_installer: lcov-1.15.tar.gz
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 25
steps:
- name: Harden Runner
Expand Down Expand Up @@ -495,7 +495,7 @@ jobs:
name: "Publish Tests Results"
if: ${{ always() }}
needs: [ unittest ]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Harden Runner
if: ${{ !github.event.repository.private }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shared_matrix_prep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ permissions:

jobs:
matrix_prep:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: ${{ inputs.run_if }}
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shared_setup_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:

jobs:
config:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: ${{ inputs.run_if }}
outputs:
nightly: ${{ steps.config.outputs.nightly }}
Expand Down
Loading
Loading