Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Story #12116: Improve GitHub Actions cache management #1890

Merged
merged 3 commits into from
Jun 24, 2024
Merged

Story #12116: Improve GitHub Actions cache management #1890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97df88d
Story #12116: Improve GitHub Actions cache management
marob Jun 3, 2024
4d52b86
Story #11854 Clean code: Configure java libraries for Sonar to preven…
marob Jun 24, 2024
b5b6b99
Story #13013: Fix build fail because of Vitam Core changes
marob Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .ci/github-actions-settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
https://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>vitam</id>
<username>${env.CI_USR}</username>
<password>${env.CI_PSW}</password>
</server>
<server>
<id>vitam-snapshots</id>
<username>${env.CI_USR}</username>
<password>${env.CI_PSW}</password>
</server>
<server>
<id>vitam-releases</id>
<username>${env.CI_USR}</username>
<password>${env.CI_PSW}</password>
</server>
</servers>
</settings>
4 changes: 2 additions & 2 deletions .ci/settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<password>${env.CI_PSW}</password>
</server>
<server>
<id>snapshots</id>
<id>vitam-snapshots</id>
<username>${env.CI_USR}</username>
<password>${env.CI_PSW}</password>
</server>
<server>
<id>releases</id>
<id>vitam-releases</id>
<username>${env.CI_USR}</username>
<password>${env.CI_PSW}</password>
</server>
Expand Down
27 changes: 23 additions & 4 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,37 @@ jobs:
name: Build Backend
runs-on: ubuntu-latest
steps:
- uses: szenius/set-timezone@v2.0
with:
timezoneLinux: "Europe/Paris" # we set the timezone for Unit Tests to pass (we shouldn't need to, but it's currently required)
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "11"
cache: "maven"
- uses: szenius/set-timezone@v2.0
- name: Restore maven cache # We're not using cache feature from actions/setup-java as it's not allowing to fine-tune it (in particular, we can't use restore-keys to load a previous cache if cache name mismatches)
uses: actions/cache@v4
with:
timezoneLinux: "Europe/Paris" # we set the timezone for Unit Tests to pass (we shouldn't need to, but it's currently required)
# See https://github.com/actions/toolkit/issues/713 for why we use */*/* to be able to exclude dependency-check-data from the cache
path: |
~/.m2/repository/*/*/*
!~/.m2/repository/org/owasp/dependency-check-data
key: maven-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
restore-keys: maven-${{ runner.os }}-${{ github.ref_protected && hashFiles('**/pom.xml') || '' }} # If the key doesn't exist, tries to find a previous cache to speedup build, except for protected branches (to make sure we have a clean cache)
- name: Get today's date
id: get-date
run: |
echo "today=$(/bin/date -u "+%Y-%m-%d")" >> $GITHUB_OUTPUT
shell: bash
- name: Restore latest owasp-dependency-check cache
uses: actions/cache@v4
with:
path: ~/.m2/repository/org/owasp/dependency-check-data
key: owasp-dependency-check-${{ steps.get-date.outputs.today }} # The key changes every day
restore-keys: owasp-dependency-check- # If the key doesn't exist, tries to find a previous cache
- name: Build and test
run: >
mvn --settings .ci/settings.xml
mvn --settings .ci/github-actions-settings.xml
-Pvitam,no-cve-proxy
-Dspotless.check.skip=true
--batch-mode --errors -U
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ jobs:
with:
distribution: "temurin"
java-version: "11"
cache: "maven"
- name: Restore maven cache # We're not using cache feature from actions/setup-java as it could conflict with other GitHub Actions maven caches (our cache doesn't include all Vitam dependencies: it is limited to spotless and its dependencies)
uses: actions/cache@v4
with:
path: |
~/.m2/repository
**/target/spotless-prettier-node-modules-*
key: maven-spotless-${{ runner.os }}-${{ hashFiles('**/pom.xml') }} # We invalidate cache if pom.xml change to detect spotless version update or new maven modules
- name: Lint Java
run: mvn -T1C spotless:check
33 changes: 14 additions & 19 deletions api/api-pastis/pastis-standalone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,11 +380,11 @@

<distributionManagement>
<repository>
<id>releases</id>
<id>vitam-releases</id>
<url>${env.SERVICE_NEXUS_URL}/repository/maven-releases/</url>
</repository>
<snapshotRepository>
<id>snapshots</id>
<id>vitam-snapshots</id>
<url>${env.SERVICE_NEXUS_URL}/repository/maven-snapshots/</url>
</snapshotRepository>
<site>
Expand All @@ -395,25 +395,20 @@

<repositories>
<repository>
<id>vitam</id>
<url>${env.SERVICE_NEXUS_URL}/repository/maven-public/</url>
<id>vitam-releases</id>
<name>Vitam release repository</name>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
<url>${env.SERVICE_NEXUS_URL}/repository/maven-releases/</url>
</repository>
<repository>
<id>vitam-snapshots</id>
<name>Vitam SNAPSHOT repository</name>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
<url>${env.SERVICE_NEXUS_URL}/repository/maven-snapshots/</url>
</repository>
</repositories>

<!-- Maven plugins repositories -->
<pluginRepositories>
<pluginRepository>
<id>vitam</id>
<url>${env.SERVICE_NEXUS_URL}/repository/maven-public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

</profile>
</profiles>
</project>
4 changes: 2 additions & 2 deletions ...mmons/src/main/java/fr/gouv/vitamui/referential/common/service/IngestContractService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,11 @@ private List<IngestContractModel> convertIngestContractsToModelOfCreation(
ac.setComputeInheritedRulesAtIngest(acModel.isComputeInheritedRulesAtIngest());

if (acModel.getActivationdate() != null) {
ac.setActivationdate(LocalDateUtil.getFormattedDateForMongo(acModel.getActivationdate()));
ac.setActivationdate(LocalDateUtil.getFormattedDateTimeForMongo(acModel.getActivationdate()));
}

if (acModel.getDeactivationdate() != null) {
ac.setDeactivationdate(LocalDateUtil.getFormattedDateForMongo(acModel.getDeactivationdate()));
ac.setDeactivationdate(LocalDateUtil.getFormattedDateTimeForMongo(acModel.getDeactivationdate()));
}

LOGGER.debug("outputIC: {}", ac);
Expand Down
5 changes: 3 additions & 2 deletions ...in/java/fr/gouv/vitamui/referential/external/server/rest/OperationExternalController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
import javax.validation.Valid;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.time.format.DateTimeFormatter;
import java.util.Collection;
import java.util.Optional;

Expand Down Expand Up @@ -166,8 +167,8 @@ public ObjectNode extractInfoFromTimestamp(final @RequestBody String timestamp)
X500Name signerCertIssuer = signerId.getIssuer();
result.put(
"genTime",
LocalDateUtil.getString(
LocalDateUtil.fromDate(tsResp.getTimeStampToken().getTimeStampInfo().getGenTime())
LocalDateUtil.fromDate(tsResp.getTimeStampToken().getTimeStampInfo().getGenTime()).format(
DateTimeFormatter.ISO_DATE_TIME
)
);
result.put("signerCertIssuer", signerCertIssuer.toString());
Expand Down
50 changes: 20 additions & 30 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2474,11 +2474,13 @@
<!-- Dépôts Maven privés -->
<distributionManagement>
<repository>
<id>releases</id>
<id>vitam-releases</id>
<name>Vitam release repository</name>
<url>${env.SERVICE_NEXUS_URL}/repository/maven-releases/</url>
</repository>
<snapshotRepository>
<id>snapshots</id>
<id>vitam-snapshots</id>
<name>Vitam SNAPSHOT repository</name>
<url>${env.SERVICE_NEXUS_URL}/repository/maven-snapshots/</url>
</snapshotRepository>
<site>
Expand All @@ -2487,33 +2489,27 @@
</site>
</distributionManagement>


<repositories>
<repository>
<id>vitam</id>
<url>${env.SERVICE_NEXUS_URL}/repository/maven-public/</url>
<id>vitam-releases</id>
<name>Vitam release repository</name>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
<url>${env.SERVICE_NEXUS_URL}/repository/maven-releases/</url>
</repository>
<repository>
<id>vitam-snapshots</id>
<name>Vitam SNAPSHOT repository</name>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
<url>${env.SERVICE_NEXUS_URL}/repository/maven-snapshots/</url>
</repository>
</repositories>

<!-- Maven plugins repositories -->
<pluginRepositories>
<pluginRepository>
<id>vitam</id>
<url>${env.SERVICE_NEXUS_URL}/repository/maven-public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

<properties>
<serverId>vitam</serverId>
<downloadRoot>${env.SERVICE_NEXUS_URL}/repository/node-distrib/</downloadRoot>
</properties>

</profile>

<profile>
Expand All @@ -2522,19 +2518,13 @@
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<!-- Dépôts Maven privés -->
<distributionManagement>
<repository>
<id>releases</id>
<url>http://download.programmevitam.fr/vitam_repository/${vitam.version}/mvn_repo/</url>
</repository>
</distributionManagement>


<!-- Dépôts publics de releases -->
<repositories>
<repository>
<id>vitam</id>
<id>public-vitam-releases</id>
<url>http://download.programmevitam.fr/vitam_repository/${vitam.version}/mvn_repo/</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
</repository>
</repositories>

Expand Down
1 change: 1 addition & 0 deletions sonar-project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ sonar.projectKey=programme-vitam2_vitam-ui
# in https://sonarcloud.io/documentation/project-administration/narrowing-the-focus/
sonar.sources=.
sonar.java.binaries=.
sonar.java.libraries=~/.m2/repository/**/*.jar

sonar.exclusions=**/node_modules/**, **/target/**
sonar.javascript.lcov.reportPaths=**/target/coverage/lcov.info
Expand Down