From 9d0e270289912914bde679f38c143f5dcec882df Mon Sep 17 00:00:00 2001 From: Tim Ireland Date: Mon, 23 Sep 2024 13:15:29 +0000 Subject: [PATCH 1/2] changed var scope --- .github/workflows/jekyll-gh-pages.yml | 4 ++-- sonar-project.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml index f8ce104..ef0b70f 100644 --- a/.github/workflows/jekyll-gh-pages.yml +++ b/.github/workflows/jekyll-gh-pages.yml @@ -86,8 +86,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - SONAR_ORGANISATION_KEY: ${{env.SONAR_ORGANISATION_KEY}} - SONAR_PROJECT_KEY: ${{env.SONAR_PROJECT_KEY}} + SONAR_ORGANISATION_KEY: ${{ vars.SONAR_ORGANISATION_KEY }} + SONAR_PROJECT_KEY: ${{ vars.SONAR_PROJECT_KEY }} # Deployment job deploy: diff --git a/sonar-project.properties b/sonar-project.properties index 0219b68..154b2fb 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,3 +1,3 @@ -sonar.organization=${env.SONAR_ORGANISATION_KEY} -sonar.projectKey=${env.SONAR_PROJECT_KEY} +sonar.organization=${var.SONAR_ORGANISATION_KEY} +sonar.projectKey=${var.SONAR_PROJECT_KEY} sonar.sources=. From eade4a4e4758bb9138de44765d75f7795c6d7f7d Mon Sep 17 00:00:00 2001 From: Tim Ireland Date: Mon, 23 Sep 2024 17:08:36 +0100 Subject: [PATCH 2/2] Update jekyll-gh-pages.yml removed config from yaml - as per https://github.com/SonarSource/sonarcloud-github-action --- .github/workflows/jekyll-gh-pages.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml index ef0b70f..0a311a3 100644 --- a/.github/workflows/jekyll-gh-pages.yml +++ b/.github/workflows/jekyll-gh-pages.yml @@ -86,8 +86,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - SONAR_ORGANISATION_KEY: ${{ vars.SONAR_ORGANISATION_KEY }} - SONAR_PROJECT_KEY: ${{ vars.SONAR_PROJECT_KEY }} # Deployment job deploy: