diff --git a/.github/jobs/build_docker_image.sh b/.github/jobs/build_docker_image.sh index d8e0e963..4d375382 100755 --- a/.github/jobs/build_docker_image.sh +++ b/.github/jobs/build_docker_image.sh @@ -18,7 +18,7 @@ if [ $? != 0 ]; then exit 1 fi -# Copy the dist directory from the image +# Copy the build directory from the image id=$(docker create ${DOCKERHUB_TAG}) -time_command docker cp $id:/METviewer/dist dist +time_command docker cp $id:/METviewer/build build docker rm -v $id diff --git a/internal/scripts/sonarqube/sonar-project.properties b/internal/scripts/sonarqube/sonar-project.properties index 3586fc31..c6cf4de9 100644 --- a/internal/scripts/sonarqube/sonar-project.properties +++ b/internal/scripts/sonarqube/sonar-project.properties @@ -4,9 +4,11 @@ sonar.projectName=METviewer sonar.projectVersion=SONAR_PROJECT_VERSION sonar.branch.name=SONAR_BRANCH_NAME sonar.sources=java -sonar.java.libraries=dist/lib -sonar.java.binaries=dist/metviewer/WEB-INF/classes +sonar.java.libraries=lib +sonar.java.binaries=build sonar.sourceEncoding=UTF-8 +sonar.exclusions=java/edu/ucar/metviewer/test/*,java/edu/ucar/metviewer/test/**/* +sonar.coverage.exclusions=java/edu/ucar/metviewer/test/*,java/edu/ucar/metviewer/test/**/* # SonarQube server sonar.host.url=SONAR_HOST_URL