Skip to content

Commit b0e48f1

Browse files
Improvements in CI workflows (#297)
* Refs #23085. Improve codeql workflow. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23085. Update mac CI to macos 15. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23085. Nightly ubuntu CI for 1.0.x in ubuntu 22. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
1 parent 88eb2ab commit b0e48f1

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
os: [windows-2022, ubuntu-22.04, macos-13, ]
39+
os: [windows-2022, ubuntu-22.04, macos-15-intel]
4040
language: [ 'cpp' ]
4141
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
4242
# Learn more:
4343
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
4444

4545
steps:
4646
- name: Checkout repository
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v5
4848

4949
# Initializes the CodeQL tools for scanning.
5050
- name: Initialize CodeQL
51-
uses: github/codeql-action/init@v3
51+
uses: github/codeql-action/init@v4
5252
with:
5353
languages: ${{ matrix.language }}
5454
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -75,4 +75,4 @@ jobs:
7575
cmake --build .
7676
7777
- name: Perform CodeQL Analysis
78-
uses: github/codeql-action/analyze@v3
78+
uses: github/codeql-action/analyze@v4

.github/workflows/mac-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
os-version:
77
description: 'OS version to run the workflow'
88
required: false
9-
default: 'macos-13'
9+
default: 'macos-15-intel'
1010
type: string
1111
colcon-args:
1212
description: 'Extra arguments for colcon cli'
@@ -49,7 +49,7 @@ jobs:
4949
with:
5050
# It would be desirable to have a matrix of macos OS for this job, but due to the issue opened in this ticket:
5151
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
52-
os-version: ${{ inputs.os-version || 'macos-13' }}
52+
os-version: ${{ inputs.os-version || 'macos-15-intel' }}
5353
label: ${{ format('mac-ci-{0}', inputs.fastcdr-branch || github.ref) }}
5454
colcon-args: ${{ inputs.colcon-args }}
5555
cmake-args: ${{ inputs.cmake-args }}

.github/workflows/nightly-mac-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
nightly-mac-ci-master:
1010
uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@master
1111
with:
12-
os-version: 'macos-13'
12+
os-version: 'macos-15-intel'
1313
label: 'nightly-mac-ci-master'
1414
fastcdr-branch: 'master'
1515
run-build: true
@@ -19,7 +19,7 @@ jobs:
1919
nightly-mac-ci-2_2_x:
2020
uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@2.2.x
2121
with:
22-
os-version: 'macos-13'
22+
os-version: 'macos-15-intel'
2323
label: 'nightly-mac-ci-2.2.x'
2424
fastcdr-branch: '2.2.x'
2525
run-build: true
@@ -29,7 +29,7 @@ jobs:
2929
nightly-mac-ci-1_0_x:
3030
uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@1.0.x
3131
with:
32-
os-version: 'macos-13'
32+
os-version: 'macos-15-intel'
3333
label: 'nightly-mac-ci-1.0.x'
3434
fastcdr-branch: '1.0.x'
3535
run-build: true

.github/workflows/nightly-ubuntu-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
nightly-ubuntu-ci-1_0_x:
3030
uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@1.0.x
3131
with:
32-
os-version: 'ubuntu-20.04'
32+
os-version: 'ubuntu-22.04'
3333
label: 'nightly-ubuntu-ci-1.0.x'
3434
fastcdr-branch: '1.0.x'
3535
run-build: true

0 commit comments

Comments
 (0)