Skip to content

Commit 402c233

Browse files
committed
Update to ubuntu 24.04 & update actions versions
1 parent c82e8b6 commit 402c233

File tree

11 files changed

+88
-46
lines changed

11 files changed

+88
-46
lines changed

.github/actions/setup-env/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ runs:
3636
using: "composite"
3737
steps:
3838
- name: Set up JDK ${{ inputs.java-version }}
39-
uses: actions/setup-java@v4
39+
uses: actions/setup-java@v5
4040
with:
4141
java-version: ${{ inputs.java-version }}
4242
distribution: 'temurin'
@@ -45,7 +45,7 @@ runs:
4545

4646
- name: Set up Python
4747
if: ${{ inputs.install-python == 'true' }}
48-
uses: actions/setup-python@v5
48+
uses: actions/setup-python@v6
4949
with:
5050
python-version: '3.10'
5151
architecture: x64

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ permissions:
2626
contents: read
2727
jobs:
2828
build:
29-
runs-on: ubuntu-22.04
29+
runs-on: ubuntu-24.04
3030
steps:
31-
- uses: actions/checkout@v5
31+
- uses: actions/checkout@v6
3232
- name: Setup Environment
3333
uses: ./.github/actions/setup-env
3434
with:

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
if: github.repository == 'apache/cloudstack'
3030
runs-on: ubuntu-24.04
3131
steps:
32-
- uses: actions/checkout@v5
32+
- uses: actions/checkout@v6
3333
with:
3434
fetch-depth: 0
3535
- name: Setup Environment
@@ -57,7 +57,7 @@ jobs:
5757
tar -czf /tmp/artifacts/targets.tar.gz $(find . -name "target" -type d) tools/marvin/dist
5858
tar -czf /tmp/artifacts/m2-cloudstack.tar.gz -C ~/.m2/repository org/apache/cloudstack
5959
- name: Upload artifacts
60-
uses: actions/upload-artifact@v4
60+
uses: actions/upload-artifact@v7
6161
with:
6262
name: build-artifacts
6363
path: /tmp/artifacts/
@@ -138,7 +138,7 @@ jobs:
138138
smoke/test_list_hosts smoke/test_list_service_offerings smoke/test_list_storage_pools
139139
smoke/test_list_volumes
140140
steps:
141-
- uses: actions/checkout@v5
141+
- uses: actions/checkout@v6
142142
with:
143143
fetch-depth: 0
144144
- name: Setup Environment
@@ -179,7 +179,7 @@ jobs:
179179
sudo systemctl restart mysql
180180
sudo mysql -uroot -e "SELECT VERSION();"
181181
- name: Download artifacts
182-
uses: actions/download-artifact@v4
182+
uses: actions/download-artifact@v8
183183
with:
184184
name: build-artifacts
185185
path: /tmp/artifacts/
@@ -233,7 +233,7 @@ jobs:
233233
run: |
234234
echo -e "Simulator CI Test Results: (only failures listed)\n"
235235
python3 ./tools/marvin/xunit-reader.py integration-test-results/
236-
- uses: codecov/codecov-action@v4
236+
- uses: codecov/codecov-action@v5
237237
with:
238238
files: jacoco-coverage.xml
239239
fail_ci_if_error: true

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ jobs:
3535
language: ["actions"]
3636
steps:
3737
- name: Checkout repository
38-
uses: actions/checkout@v5
38+
uses: actions/checkout@v6
3939
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@v3
40+
uses: github/codeql-action/init@v4
4141
with:
4242
languages: ${{ matrix.language }}
4343
- name: Autobuild
44-
uses: github/codeql-action/autobuild@v3
44+
uses: github/codeql-action/autobuild@v4
4545
- name: Perform CodeQL Analysis
46-
uses: github/codeql-action/analyze@v3
46+
uses: github/codeql-action/analyze@v4
4747
with:
4848
category: "Security"

.github/workflows/docker-cloudstack-simulator.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ concurrency:
3535
jobs:
3636
build:
3737
if: github.repository == 'apache/cloudstack'
38-
runs-on: ubuntu-22.04
38+
runs-on: ubuntu-24.04
3939
steps:
4040
- name: Login to Docker Registry
41-
uses: docker/login-action@v2
41+
uses: docker/login-action@v4
4242
with:
4343
registry: ${{ secrets.DOCKER_REGISTRY }}
4444
username: ${{ secrets.DOCKERHUB_USER }}
@@ -47,7 +47,7 @@ jobs:
4747
- name: Set Docker repository name
4848
run: echo "DOCKER_REPOSITORY=apache" >> $GITHUB_ENV
4949

50-
- uses: actions/checkout@v5
50+
- uses: actions/checkout@v6
5151

5252
- name: Set ACS version
5353
run: echo "ACS_VERSION=$(grep '<version>' pom.xml | head -2 | tail -1 | cut -d'>' -f2 |cut -d'<' -f1)" >> $GITHUB_ENV
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: Sonar Quality Check (Main)
19+
permissions:
20+
contents: read
21+
on:
22+
push:
23+
branches:
24+
- main
25+
concurrency:
26+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
27+
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
28+
jobs:
29+
build:
30+
if: github.repository == 'apache/cloudstack'
31+
name: Sonar JaCoCo Coverage
32+
runs-on: ubuntu-24.04
33+
steps:
34+
- uses: actions/checkout@v6
35+
with:
36+
fetch-depth: 0
37+
- name: Setup Environment
38+
uses: ./.github/actions/setup-env
39+
- name: Cache SonarCloud packages
40+
uses: actions/cache@v5
41+
with:
42+
path: ~/.sonar/cache
43+
key: ${{ runner.os }}-sonar
44+
restore-keys: ${{ runner.os }}-sonar
45+
- name: Install Non-OSS
46+
uses: ./.github/actions/install-nonoss
47+
- name: Run Build and Tests with Coverage
48+
run: |
49+
mvn -T$(nproc) -P quality -Dsimulator -Dnoredist clean install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=apache_cloudstack

.github/workflows/merge-conflict-checker.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
pull_request:
2222
types: [opened, synchronize, reopened]
2323

24-
permissions: # added using https://github.com/step-security/secure-workflows
24+
permissions: # added using https://github.com/step-security/secure-workflows
2525
contents: read
2626

2727
concurrency:
@@ -31,14 +31,14 @@ concurrency:
3131
jobs:
3232
triage:
3333
permissions:
34-
pull-requests: write # for eps1lon/actions-label-merge-conflict to label PRs
35-
runs-on: ubuntu-22.04
34+
pull-requests: write # for eps1lon/actions-label-merge-conflict to label PRs
35+
runs-on: ubuntu-24.04
3636
steps:
37-
- name: Conflict Check
38-
uses: eps1lon/actions-label-merge-conflict@v2.0.0
39-
with:
40-
repoToken: "${{ secrets.GITHUB_TOKEN }}"
41-
dirtyLabel: "status:has-conflicts"
42-
removeOnDirtyLabel: "status:ready-for-review"
43-
continueOnMissingPermissions: true
44-
commentOnDirty: "This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch."
37+
- name: Conflict Check
38+
uses: eps1lon/actions-label-merge-conflict@v3
39+
with:
40+
repoToken: "${{ secrets.GITHUB_TOKEN }}"
41+
dirtyLabel: "status:has-conflicts"
42+
removeOnDirtyLabel: "status:ready-for-review"
43+
continueOnMissingPermissions: true
44+
commentOnDirty: "This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch."

.github/workflows/pre-commit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ concurrency:
2929
jobs:
3030
pre-commit:
3131
name: Run pre-commit
32-
runs-on: ubuntu-22.04
32+
runs-on: ubuntu-24.04
3333
steps:
3434
- name: Check Out
35-
uses: actions/checkout@v5
35+
uses: actions/checkout@v6
3636
- name: Install
3737
run: |
3838
python -m pip install --upgrade pip

.github/workflows/rat.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ permissions:
2626
contents: read
2727
jobs:
2828
build:
29-
runs-on: ubuntu-22.04
29+
runs-on: ubuntu-24.04
3030
steps:
31-
- uses: actions/checkout@v5
31+
- uses: actions/checkout@v6
3232
- name: Setup Environment
3333
uses: ./.github/actions/setup-env
3434
- name: Install Non-OSS

.github/workflows/sonar-check.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,17 @@ permissions:
2020
contents: read
2121
pull-requests: write
2222
on:
23-
push:
24-
branches:
25-
- main
2623
pull_request:
2724
concurrency:
2825
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
2926
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
3027
jobs:
3128
build:
32-
if: github.repository == 'apache/cloudstack' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
29+
if: github.repository == 'apache/cloudstack' && github.event.pull_request.head.repo.full_name == github.repository
3330
name: Sonar JaCoCo Coverage
34-
runs-on: ubuntu-22.04
31+
runs-on: ubuntu-24.04
3532
steps:
36-
- uses: actions/checkout@v5
33+
- uses: actions/checkout@v6
3734
with:
3835
fetch-depth: 0
3936
- name: Setup Environment
@@ -53,8 +50,4 @@ jobs:
5350
PR_ID: ${{ github.event.pull_request.number }}
5451
HEADREF: ${{ github.event.pull_request.head.ref }}
5552
run: |
56-
if [ "${{ github.event_name }}" == "pull_request" ]; then
57-
mvn -T$(nproc) -P quality -Dsimulator -Dnoredist clean install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=apache_cloudstack -Dsonar.pullrequest.key="$PR_ID" -Dsonar.pullrequest.branch="$HEADREF" -Dsonar.pullrequest.github.repository=apache/cloudstack -Dsonar.pullrequest.provider=GitHub -Dsonar.pullrequest.github.summary_comment=true
58-
else
59-
mvn -T$(nproc) -P quality -Dsimulator -Dnoredist clean install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=apache_cloudstack
60-
fi
53+
mvn -T$(nproc) -P quality -Dsimulator -Dnoredist clean install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=apache_cloudstack -Dsonar.pullrequest.key="$PR_ID" -Dsonar.pullrequest.branch="$HEADREF" -Dsonar.pullrequest.github.repository=apache/cloudstack -Dsonar.pullrequest.provider=GitHub -Dsonar.pullrequest.github.summary_comment=true

0 commit comments

Comments
 (0)