diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml index b8f195c65dd4..478a871d2570 100644 --- a/.github/codeql/codeql-config.yml +++ b/.github/codeql/codeql-config.yml @@ -8,4 +8,4 @@ queries: - name: Extended Security uses: security-extended - name: Security and Quality - uses: security-and-quality \ No newline at end of file + uses: security-and-quality diff --git a/.github/workflows/analyse-pr.yml b/.github/workflows/analyse-pr.yml index aed1654d2e6e..1099d8790185 100644 --- a/.github/workflows/analyse-pr.yml +++ b/.github/workflows/analyse-pr.yml @@ -40,11 +40,11 @@ jobs: PR: ${{ github.event.number }} if: github.event_name == 'pull_request' run: | - mvn -f dhis-2/pom.xml clean install --threads 2C --batch-mode --no-transfer-progress -DskipTests + mvn -f dhis-2/pom.xml clean install --threads 2C --batch-mode --update-snapshots --no-transfer-progress -DskipTests mvn -f dhis-2/pom.xml sonar:sonar -Dsonar.internal.analysis.dbd=false --batch-mode --no-transfer-progress -Dsonar.scm.revision=${{ github.event.pull_request.head.sha }} -Dsonar.projectKey=dhis2_dhis2-core - name: Analyse long-living branch if: github.event_name != 'pull_request' run: | - mvn -f dhis-2/pom.xml clean install --threads 2C --batch-mode --no-transfer-progress -DskipTests + mvn -f dhis-2/pom.xml clean install --threads 2C --batch-mode --update-snapshots --no-transfer-progress -DskipTests mvn -f dhis-2/pom.xml sonar:sonar -Dsonar.internal.analysis.dbd=false --batch-mode --no-transfer-progress -Dsonar.branch.name=${GITHUB_REF#refs/heads/} -Dsonar.projectKey=dhis2_dhis2-core diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1613f5306039..04d876b2c428 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -58,9 +58,9 @@ jobs: config-file: ./.github/codeql/codeql-config.yml - name: Build core - run: mvn clean install -f ./dhis-2/pom.xml --batch-mode --no-transfer-progress -Pdev -DskipTests=true -Dmaven.javadoc.skip=true -V + run: mvn clean install -f ./dhis-2/pom.xml --batch-mode --no-transfer-progress --update-snapshots -Pdev -DskipTests=true -Dmaven.javadoc.skip=true -V - name: Build web - run: mvn clean install -f ./dhis-2/dhis-web/pom.xml --batch-mode --no-transfer-progress -Pdev -DskipTests=true -Dmaven.javadoc.skip=true -V + run: mvn clean install -f ./dhis-2/dhis-web/pom.xml --batch-mode --no-transfer-progress --update-snapshots -Pdev -DskipTests=true -Dmaven.javadoc.skip=true -V - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/run-api-analytics-tests.yml b/.github/workflows/run-api-analytics-tests.yml index 56e29fbdf642..5ee31ec503c4 100644 --- a/.github/workflows/run-api-analytics-tests.yml +++ b/.github/workflows/run-api-analytics-tests.yml @@ -31,7 +31,7 @@ jobs: # Remove Android and .NET libs (approx. 14GB) sudo rm -rf /usr/local/lib/android sudo rm -rf /usr/share/dotnet - + - name: Set up JDK 17 uses: actions/setup-java@v4 with: @@ -41,8 +41,8 @@ jobs: - name: Build core image run: | - mvn clean install --threads 2C --batch-mode --no-transfer-progress -DskipTests -Dmaven.test.skip=true -f dhis-2/pom.xml -pl -dhis-web-embedded-jetty,-dhis-test-integration,-dhis-test-coverage - mvn clean install --threads 2C --batch-mode --no-transfer-progress -DskipTests -Dmaven.test.skip=true -f dhis-2/dhis-web/pom.xml + mvn clean install --threads 2C --batch-mode --no-transfer-progress -DskipTests -Dmaven.test.skip=true --update-snapshots -f dhis-2/pom.xml -pl -dhis-web-embedded-jetty,-dhis-test-integration,-dhis-test-coverage + mvn clean install --threads 2C --batch-mode --no-transfer-progress -DskipTests -Dmaven.test.skip=true --update-snapshots -f dhis-2/dhis-web/pom.xml mvn --batch-mode --no-transfer-progress -DskipTests -Dmaven.test.skip=true -f ./dhis-2/dhis-web/dhis-web-portal/pom.xml jib:dockerBuild -Djib.to.image=$CORE_IMAGE_NAME - name: Get Sierra Leone DB from cache diff --git a/.github/workflows/run-api-tests.yml b/.github/workflows/run-api-tests.yml index 3f254b9226aa..c4e9a13cdb05 100644 --- a/.github/workflows/run-api-tests.yml +++ b/.github/workflows/run-api-tests.yml @@ -37,8 +37,8 @@ jobs: - name: Build war run: | - mvn clean install --threads 2C --batch-mode --no-transfer-progress -DskipTests -Dmaven.test.skip=true -f dhis-2/pom.xml -pl -dhis-web-embedded-jetty,-dhis-test-integration,-dhis-test-coverage - mvn clean install --threads 2C --batch-mode --no-transfer-progress -DskipTests -Dmaven.test.skip=true -f dhis-2/dhis-web/pom.xml + mvn clean install --threads 2C --batch-mode --no-transfer-progress -DskipTests -Dmaven.test.skip=true --update-snapshots -f dhis-2/pom.xml -pl -dhis-web-embedded-jetty,-dhis-test-integration,-dhis-test-coverage + mvn clean install --threads 2C --batch-mode --no-transfer-progress -DskipTests -Dmaven.test.skip=true --update-snapshots -f dhis-2/dhis-web/pom.xml - name: Build container image run: | diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8358ee95ff0e..7a899bc5d4c8 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -69,7 +69,7 @@ jobs: distribution: temurin cache: maven - name: Run integration tests - run: mvn clean verify --threads 2C --batch-mode --no-transfer-progress -Pintegration -f ./dhis-2/pom.xml -pl -dhis-web-embedded-jetty + run: mvn clean verify --threads 2C --batch-mode --no-transfer-progress -Pintegration --update-snapshots -f ./dhis-2/pom.xml -pl -dhis-web-embedded-jetty timeout-minutes: 30 - uses: actions/upload-artifact@v3 name: Upload test logs on failure @@ -120,7 +120,7 @@ jobs: distribution: temurin cache: maven - name: Run integration h2 tests - run: mvn clean verify --threads 2C --batch-mode --no-transfer-progress -PintegrationH2 -f ./dhis-2/pom.xml -pl -dhis-web-embedded-jetty + run: mvn clean verify --threads 2C --batch-mode --no-transfer-progress -PintegrationH2 --update-snapshots -f ./dhis-2/pom.xml -pl -dhis-web-embedded-jetty timeout-minutes: 30 - uses: actions/upload-artifact@v3 name: Upload test logs on failure @@ -175,4 +175,3 @@ jobs: SLACK_CHANNEL: 'team-backend' SLACK_MESSAGE: "Latest test run on master failed and needs investigation :detective-duck:. \n Commit message: ${{ github.event.head_commit.message }}" SLACK_COLOR: '#ff0000' -