Skip to content

Commit 6792f0e

Browse files
GabrielFleischersonartech
authored andcommitted
SONARSLANG-719 Finalize CI Migration (#581)
1 parent ae18325 commit 6792f0e

File tree

7 files changed

+11
-117
lines changed

7 files changed

+11
-117
lines changed

.cirrus.star

Lines changed: 0 additions & 22 deletions
This file was deleted.

.cirrus/.cirrus.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.cirrus/Dockerfile

Lines changed: 0 additions & 23 deletions
This file was deleted.

.cirrus/build.sh

Lines changed: 0 additions & 30 deletions
This file was deleted.

.cirrus/use-gradle-wrapper.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

.github/workflows/build.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,32 @@ jobs:
2121
permissions:
2222
id-token: write # Required for Vault OIDC authentication
2323
contents: write # Required for repository access and tagging
24+
outputs:
25+
build-number: ${{ steps.build.outputs.BUILD_NUMBER }}
26+
deployed: ${{ steps.build.outputs.deployed }}
2427
steps:
2528
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2629
- uses: jdx/mise-action@5ac50f778e26fac95da98d50503682459e86d566 # v3.2.0
2730
with:
2831
version: 2025.7.12
2932
- uses: SonarSource/ci-github-actions/build-gradle@v1
33+
id: build
3034
with:
3135
artifactory-deploy-repo: sonarsource-public-qa
3236
deploy-pull-request: true
3337
use-develocity: true
3438

3539
promote:
40+
name: Promote
3641
needs:
3742
- build
43+
if: ${{ needs.build.outputs.deployed }}
3844
runs-on: sonar-xs
39-
name: Promote
4045
permissions:
4146
id-token: write # Required for Vault OIDC authentication
4247
contents: write # Required for repository access and tagging
48+
env:
49+
BUILD_NUMBER: ${{ needs.build.outputs.build-number }}
4350
steps:
4451
- uses: SonarSource/ci-github-actions/promote@v1
4552
with:

build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ allprojects {
3030

3131
ext {
3232
buildNumber = System.getProperty("buildNumber")
33-
sonarLinksCi = 'https://cirrus-ci.com/github/SonarSource/slang'
33+
sonarLinksCi = 'https://github.com/SonarSource/slang/actions/workflows/build.yml'
3434
sonarLinksScm = 'https://github.com/SonarSource/slang'
3535

3636
artifactsToPublish = '' +
@@ -217,8 +217,7 @@ subprojects {
217217
def signingPassword = findProperty("signingPassword")
218218
useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
219219
required {
220-
// TODO: switch to GitHub Actions or remove.
221-
def branch = System.getenv()["CIRRUS_BRANCH"]
220+
def branch = System.getenv()["GITHUB_REF_NAME"]
222221
return (branch == 'master' || branch ==~ 'branch-[\\d.]+') &&
223222
gradle.taskGraph.hasTask(":artifactoryPublish")
224223
}
@@ -227,7 +226,7 @@ subprojects {
227226

228227
tasks.withType(Sign) {
229228
onlyIf {
230-
def branch = System.getenv()["CIRRUS_BRANCH"]
229+
def branch = System.getenv()["GITHUB_REF_NAME"]
231230
return (branch == 'master' || branch ==~ 'branch-[\\d.]+') &&
232231
gradle.taskGraph.hasTask(":artifactoryPublish")
233232
}

0 commit comments

Comments
 (0)