diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 50ed1f6..4d10e08 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -44,10 +44,13 @@ jobs: git fetch --depth 1 origin ${{ github.ref }} git checkout FETCH_HEAD - - name: Install Node.js and Sonar Scanner + - name: Install Java and Sonar Scanner run: | apk add --no-cache nodejs npm curl openjdk17-jre - npm install -g sonarqube-scanner + curl -sSLo /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.2.1.4610.zip + unzip -q /tmp/sonar-scanner-cli.zip -d /opt + rm /tmp/sonar-scanner-cli.zip + ln -sf /opt/sonar-scanner-6.2.1.4610-linux-x64/bin/sonar-scanner /usr/local/bin/sonar-scanner - name: SonarQube Scan env: @@ -72,21 +75,21 @@ jobs: echo "Sample files:" find . -maxdepth 2 -type f | head -n 20 echo "Running local sonar-scanner..." - set -- \ + sonar-scanner \ -Dsonar.host.url="$HOST_URL" \ -Dsonar.token="$SONAR_TOKEN" \ -Dsonar.projectKey="$PROJECT_KEY" \ -Dsonar.sources=. \ -Dsonar.scm.disabled=true \ - -Dsonar.projectBaseDir="$WORKDIR" - - if [ "${SONAR_ENABLE_BRANCH:-}" = "true" ]; then - set -- "$@" -Dsonar.branch.name="$BRANCH_NAME" - else - echo "Branch analysis disabled (requires SonarQube Developer Edition)" - fi - - sonar-scanner "$@" + -Dsonar.projectBaseDir="$WORKDIR" \ + -Dsonar.branch.name="$BRANCH_NAME" 2>/dev/null || \ + sonar-scanner \ + -Dsonar.host.url="$HOST_URL" \ + -Dsonar.token="$SONAR_TOKEN" \ + -Dsonar.projectKey="$PROJECT_KEY" \ + -Dsonar.sources=. \ + -Dsonar.scm.disabled=true \ + -Dsonar.projectBaseDir="$WORKDIR" docker: needs: [lint, sonar]