From 8765a1d6c83ae00c2b59582e0be892e3a378ebe2 Mon Sep 17 00:00:00 2001 From: fnecas Date: Fri, 26 Jan 2024 10:06:56 +0100 Subject: [PATCH] feat: readjust doc and pull request template remove docker build --- .github/pull_request_template.md | 2 +- .github/workflows/georchestra-gn4.yml | 25 +------------------- georchestra-migration/migration-dev-guide.md | 11 +++++++-- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 8d0c336427..0594c8dcc9 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,7 +2,7 @@ - [ ] PR only involves cherry picked commits from upstream. -- [ ] PR contains custom code which will be soon available in a release on upstream and can be overrided. +- [ ] PR contains custom code which will be soon available in a release on upstream and can be overrided. Mention core-geonetwork version if possible. - [ ] PR contains custom georchestra code, which need to be verified in future migration. - [ ] I have properly filled [migration-helper-changelog.md](..%2Fgeorchestra-migration%2Fmigration-helper-changelog.md) file. diff --git a/.github/workflows/georchestra-gn4.yml b/.github/workflows/georchestra-gn4.yml index 2aa7a701c1..465eb3f48e 100644 --- a/.github/workflows/georchestra-gn4.yml +++ b/.github/workflows/georchestra-gn4.yml @@ -12,6 +12,7 @@ env: jobs: build: + if: "!startsWith(github.event.head_commit.message, '[skip ci] ')" runs-on: ubuntu-latest timeout-minutes: 40 steps: @@ -55,33 +56,9 @@ jobs: - name: "run tests" run: mvn verify -Pit - - name: "Building the docker image" - working-directory: web/ - run: | - mvn clean package docker:build -Pdocker,log4j-logstash,sentry-log4j \ - -DdockerImageName=georchestra/geonetwork:${DOCKER_TAG} -DskipTests - - name: "publish the webapp as artifact" if: github.repository == 'georchestra/geonetwork' && github.actor != 'dependabot[bot]' && github.ref == 'refs/heads/georchestra-gn4.2.x' && github.event_name != 'pull_request' uses: actions/upload-artifact@v1 with: name: geonetwork.war path: web/target/geonetwork.war - - - name: "Login onto docker-hub" - if: github.repository == 'georchestra/geonetwork' && github.actor != 'dependabot[bot]' && github.ref == 'refs/heads/georchestra-gn4.2.x' && github.event_name != 'pull_request' - uses: docker/login-action@v1 - with: - username: '${{ secrets.DOCKER_HUB_USERNAME }}' - password: '${{ secrets.DOCKER_HUB_PASSWORD }}' - - - name: "Pushing branch image to docker-hub" - if: github.repository == 'georchestra/geonetwork' && github.actor != 'dependabot[bot]' && github.ref == 'refs/heads/georchestra-gn4.2.x' && github.event_name != 'pull_request' - run: | - docker push georchestra/geonetwork:${DOCKER_TAG} - - - name: "Pushing latest image to docker-hub" - if: github.repository == 'georchestra/geonetwork' && github.actor != 'dependabot[bot]' && github.ref == 'refs/heads/georchestra-gn4.2.x' && github.event_name != 'pull_request' - run: | - docker tag georchestra/geonetwork:${DOCKER_TAG} georchestra/geonetwork:latest - docker push georchestra/geonetwork:latest diff --git a/georchestra-migration/migration-dev-guide.md b/georchestra-migration/migration-dev-guide.md index fe37cb9772..09a9a14f24 100644 --- a/georchestra-migration/migration-dev-guide.md +++ b/georchestra-migration/migration-dev-guide.md @@ -33,7 +33,10 @@ All italic folder just have the `pom.xml` change. - `config-spring-geonetwork.xml` : Implement `context:property-placeholder` for georchestra's datadir - `src/test/resources/config-spring-geonetwork.xml`: Add GeonetworkDataDirectory bean - `cleanoutdatabase.sql`: Delete from settings-ui at the end of the file -- *csw-server* +- csw-server + - `CswFilter2Es.java` : Keep `{@}` instead of `%s` until it is fixed upstream (not supporting some CSW request) + - `CswFilter2EsTest.java` : Keep `{@}` instead of `%s` + - `SearchController.java` : Keep `{@}` instead of `%s` with StringUtils.replace - **docker** - Mandatory, get everything from geOrchestra - *docs* @@ -66,6 +69,7 @@ All italic folder just have the `pom.xml` change. - `test/resources/metadata-for-editing.xml` - `test/resources/metadata-for-editing-light.xml` - `test/resources/metadata-iso19139-for-editing.xml` + - `src/main/plugin/iso19115-3.2018/config/associated-panel/default.json` : Keep OGC API - Features placeholder - `src/main/plugin/iso19139/loc` : 3Dtiles added in labels.xml files. - *schemas-test* - *sde* @@ -74,12 +78,13 @@ All italic folder just have the `pom.xml` change. - `MetadataExtentApiTest.java` : Update image signatures if necessary (tests may fail see [MetadataExtentApiTest-reference](resources%2FMetadataExtentApiTest-reference) for image reference) - `BatchOpsMetadatReindexerTest.java` : Add PowerMockIgnore - `pom.xml`: version to update **and to add to gn-services** + - `LogUtils.java`: Keep custom configuration in `refreshLogConfiguration()` method. - *slave* - web - `src/docker`: Mandatory, get everything from geOrchestra - `main/filters/prod.properties`: Session timeout variable updated - `main/filters/java/org/fao/geonet/proxy`: Mandatory, get everything from geOrchestra - - `data-db-default.sql` : Some data to retrieve: setting-ui, inspire activated, georchestra name and (backported value) sitemapLinkUrl + - `data-db-default.sql` : Some data to retrieve: setting-ui, inspire activated, georchestra name, (backported value) sitemapLinkUrl, xlinkresolver enabled by default - `UpdateMetadataStatus.java`: Some fixes - `config-security.xml`: Remove config security add start of file, get end of the file from georchestra. - `config-geonetwork-georchestra.properties`, `config-georchestra-geonetwork-datadirs.xml`, `DKAN-to-ISO19115-3-2018.xsl`, `GeoIDE-services-OGC.xsl`, `udata-to-ISO19115-3-2018.xsl` @@ -93,6 +98,7 @@ All italic folder just have the `pom.xml` change. - `spring-servlet.xml`: Implement `context:property-placeholder` for georchestra's datadir - `postgres-postgis.xml` Keep `context:property-placeholder` for georchestra's datadir - `pom.xml`: Update `dockerGnDatadirScmVersion` variable accordingly and remove `font-awesome/css/` from `packagingExclude` + - `pom.xml`: Keep exclusion of groovy package to avoid two versions of it. - web-ui - `pom.xml`: version to update **and to add to gn-web-ui** - `RelatedResourcesService.js`: Add 3DTiles @@ -106,6 +112,7 @@ All italic folder just have the `pom.xml` change. - `gn_navbar_default.less`: Same (header position) - `src/main/resources/catalog/views/module.js`: Add 3DTiles - `src/main/resources/catalog/views/georchestra/`: Get files from georchestra + - `*-admin.json` : Keep change from `metadata/url/sitemapLinkUrl` to `system/server/sitemapLinkUrl` until it is fixed upstream - *workers* - *wro4j* - .gitignore