diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 14820bdb..3a843e4e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022, ubuntu-22.04, macos-13, ] + os: [windows-2022, ubuntu-22.04, macos-15-intel] language: [ 'cpp' ] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] # Learn more: @@ -34,11 +34,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v5 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -65,4 +65,4 @@ jobs: cmake --build . - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v4 diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml index 9ea93930..537746ce 100644 --- a/.github/workflows/mac-ci.yml +++ b/.github/workflows/mac-ci.yml @@ -6,7 +6,7 @@ on: os-version: description: 'OS version to run the workflow' required: false - default: 'macos-13' + default: 'macos-15-intel' type: string colcon-args: description: 'Extra arguments for colcon cli' @@ -49,7 +49,7 @@ jobs: with: # It would be desirable to have a matrix of macos OS for this job, but due to the issue opened in this ticket: # https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job. - os-version: ${{ inputs.os-version || 'macos-13' }} + os-version: ${{ inputs.os-version || 'macos-15-intel' }} label: ${{ format('mac-ci-{0}', inputs.fastcdr-branch || github.ref) }} colcon-args: ${{ inputs.colcon-args }} cmake-args: ${{ inputs.cmake-args }} diff --git a/configure.ac b/configure.ac index bba072bd..da935316 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ # m4_define([version_major],[1]) m4_define([version_minor],[0]) -m4_define([version_micro],[28]) +m4_define([version_micro],[29]) AC_INIT([fastcdr], [version_major.version_minor.version_micro], [support@eprosima.com], [eProsima FastCDR], [http://eprosima.com/]) CONFIG_ARGS="$*"