Skip to content

Commit b6d3d9a

Browse files
committed
Merge branch 'release/25.4' into release/26.1
# Conflicts: # .github/workflows/fe-code-quality.yml # .github/workflows/fe-sonar.yml
2 parents 5e1a147 + 79a5676 commit b6d3d9a

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

.github/workflows/fe-code-quality.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ on:
2121
description: "Additional sonar-project.properties content"
2222
type: string
2323
default: ""
24+
GITHUB_RUNNER:
25+
required: false
26+
description: "Github runner which is used to run sonar scan jobs"
27+
type: string
28+
default: 'medium'
2429

2530
jobs:
2631
code-quality:
@@ -105,7 +110,7 @@ jobs:
105110
name: SonarCloud
106111
needs: [code-quality, check-sonar]
107112
if: needs.check-sonar.outputs.has_token == 'true'
108-
runs-on: ubuntu-latest
113+
runs-on: ${{ inputs.GITHUB_RUNNER }}
109114
steps:
110115
- name: Set SonarCloud Project Key
111116
id: set-project-key
@@ -134,7 +139,7 @@ jobs:
134139
cat sonar-project.properties
135140
136141
- name: download coverage report
137-
uses: actions/download-artifact@v5
142+
uses: actions/download-artifact@v4
138143
with:
139144
path: ./coverage
140145
pattern: coverage-*

.github/workflows/fe-sonar.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,16 @@ on:
1818
description: "Additional sonar-project.properties content"
1919
type: string
2020
default: ""
21+
GITHUB_RUNNER:
22+
required: false
23+
description: "Github runner which is used to run sonar scan jobs"
24+
type: string
25+
default: 'medium'
2126

2227
jobs:
2328
sonarqube-scan:
2429
name: SonarQube Code Quality Scan
25-
runs-on: ubuntu-latest
30+
runs-on: {{ inputs.GITHUB_RUNNER }}
2631
# Only run the workflow for master/main and release branches
2732
if: github.ref_name == 'master' || github.ref_name == 'main' || startsWith(github.ref_name, 'release/')
2833
permissions:

0 commit comments

Comments
 (0)