From b2eeebfbb1457c9162d5bf3adc4bd2f39395dda2 Mon Sep 17 00:00:00 2001 From: firegloves Date: Mon, 12 Jul 2021 14:56:42 +0200 Subject: [PATCH 1/7] ENG-2471 wf test --- .github/workflows/publication.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publication.yml b/.github/workflows/publication.yml index 13f21d43a..d374773d7 100644 --- a/.github/workflows/publication.yml +++ b/.github/workflows/publication.yml @@ -65,3 +65,4 @@ jobs: ~/ppl-run docker publish "$ENTANDO_OPT_DOCKER_BUILDS"\ --id "PUBLISH-DOCKER" \ --lcd "$REPO_FOLDER" + From 0ab45f8a69a4c68be19cd54ea4e9d732f51012dc Mon Sep 17 00:00:00 2001 From: w-caffiero-entando <63636347+w-caffiero-entando@users.noreply.github.com> Date: Mon, 12 Jul 2021 23:04:04 +0200 Subject: [PATCH 2/7] Update pr.yml --- .github/workflows/pr.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 717d75b25..23dc4371a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -16,7 +16,8 @@ env: ENTANDO_OPT_FEATURES: ${{ secrets.ENTANDO_OPT_FEATURES }} GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }} GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }} - ENTANDO_OPT_USE_PPL_TAG: ${{ secrets.ENTANDO_OPT_USE_PPL_TAG }} + #ENTANDO_OPT_USE_PPL_TAG: ${{ secrets.ENTANDO_OPT_USE_PPL_TAG }} + ENTANDO_OPT_USE_PPL_TAG: "engine-exp" ENTANDO_OPT_REPO_BOM_URL: ${{ secrets.ENTANDO_OPT_REPO_BOM_URL }} PPL_CONTEXT: ${{ toJson(github) }} REPO_FOLDER: "local-checkout" From 85d028452243cd72d96bc7303d81447233e9bb8f Mon Sep 17 00:00:00 2001 From: Walter Caffiero Date: Tue, 13 Jul 2021 01:21:55 +0200 Subject: [PATCH 3/7] Exp --- .github/workflows/pr.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 23dc4371a..f43d2c321 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -21,7 +21,8 @@ env: ENTANDO_OPT_REPO_BOM_URL: ${{ secrets.ENTANDO_OPT_REPO_BOM_URL }} PPL_CONTEXT: ${{ toJson(github) }} REPO_FOLDER: "local-checkout" - ENTANDO_OPT_LOG_LEVEL: ${{ secrets.ENTANDO_OPT_LOG_LEVEL }} + #ENTANDO_OPT_LOG_LEVEL: ${{ secrets.ENTANDO_OPT_LOG_LEVEL }} + ENTANDO_OPT_LOG_LEVEL: "###TRACE" jobs: # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From 651cccd26058eb7b5908558a40eeef9f0c6e0918 Mon Sep 17 00:00:00 2001 From: Walter Caffiero Date: Tue, 13 Jul 2021 09:55:08 +0200 Subject: [PATCH 4/7] Exp with a psecific test --- .github/workflows/post-merge.yml | 2 +- .github/workflows/pr.yml | 11 ++++------- .github/workflows/publication.yml | 27 ++++++++++++++------------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.github/workflows/post-merge.yml b/.github/workflows/post-merge.yml index c5f3e5401..9d862cc47 100644 --- a/.github/workflows/post-merge.yml +++ b/.github/workflows/post-merge.yml @@ -23,7 +23,7 @@ jobs: steps: - name: "ADD RELEASE TAG" run: | - bash <(curl -qsL "https://raw.githubusercontent.com/entando/entando-pipelines/${ENTANDO_OPT_USE_PPL_TAG}/macro/install.sh") + ${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }} ~/ppl-run pr-status-report \ .. checkout-branch base \ diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f43d2c321..6cfb6f6b5 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,5 +1,3 @@ -# This workflow will prepare every thing required to proceed with a PR -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven name: PR-CYCLE @@ -21,8 +19,8 @@ env: ENTANDO_OPT_REPO_BOM_URL: ${{ secrets.ENTANDO_OPT_REPO_BOM_URL }} PPL_CONTEXT: ${{ toJson(github) }} REPO_FOLDER: "local-checkout" - #ENTANDO_OPT_LOG_LEVEL: ${{ secrets.ENTANDO_OPT_LOG_LEVEL }} - ENTANDO_OPT_LOG_LEVEL: "###TRACE" + ENTANDO_OPT_LOG_LEVEL: ${{ secrets.ENTANDO_OPT_LOG_LEVEL }} + jobs: # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -129,10 +127,8 @@ jobs: restore-keys: ${{ runner.os }}-sonar - name: "Build and analyze" if: steps.GATE.outputs.ENABLED == 'true' - run: | + run: | ~/ppl-run mvn SONAR --lcd "$REPO_FOLDER" - - name: "Clean SKIP-SONAR" - if: steps.GATE.outputs.ENABLED != 'true' run: | ~/ppl-run @pr-labels remove "skip-sonar" --id "CLEAN-SKIP-SONAR" # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -169,6 +165,7 @@ jobs: if: steps.GATE.outputs.ENABLED != 'true' run: | ~/ppl-run @pr-labels remove "skip-owasp" --id "CLEAN-SKIP-OWASP" + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # SNYK snyk: diff --git a/.github/workflows/publication.yml b/.github/workflows/publication.yml index d374773d7..0825a2a63 100644 --- a/.github/workflows/publication.yml +++ b/.github/workflows/publication.yml @@ -1,4 +1,4 @@ -name: Internal Publication +name: Release to internal Nexus on: push: @@ -8,17 +8,18 @@ on: env: ENTANDO_OPT_FEATURES: ${{ secrets.ENTANDO_OPT_FEATURES }} + ENTANDO_OPT_USE_PPL_TAG: ${{ secrets.ENTANDO_OPT_USE_PPL_TAG }} + ENTANDO_OPT_REPO_BOM_URL: ${{ secrets.ENTANDO_OPT_REPO_BOM_URL }} + ENTANDO_OPT_LOG_LEVEL: ${{ secrets.ENTANDO_OPT_LOG_LEVEL }} + PPL_CONTEXT: ${{ toJson(github) }} + GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }} + GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }} + REPO_FOLDER: "local-checkout" jobs: internal-publication: env: - ENTANDO_OPT_USE_PPL_TAG: ${{ secrets.ENTANDO_OPT_USE_PPL_TAG }} - ENTANDO_OPT_REPO_BOM_URL: ${{ secrets.ENTANDO_OPT_REPO_BOM_URL }} - PPL_CONTEXT: ${{ toJson(github) }} - GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }} - GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }} - REPO_FOLDER: "repo_folder" - ENTANDO_OPT_LOG_LEVEL: DEBUG + ENTANDO_OPT_MAVEN_REPO_DEVL: ${{ secrets.ENTANDO_OPT_MAVEN_REPO_DEVL }} ENTANDO_OPT_MAVEN_REPO_PROD: ${{ secrets.ENTANDO_OPT_MAVEN_REPO_PROD }} ENTANDO_BOT_TOKEN: ${{ secrets.ENTANDO_BOT_TOKEN }} @@ -26,7 +27,7 @@ jobs: steps: - name: "PR PIPELINE START" run: | - bash <(curl -qsL "https://raw.githubusercontent.com/entando/entando-pipelines/${ENTANDO_OPT_USE_PPL_TAG}/macro/install.sh") + ${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }} ~/ppl-run status-report - name: "Checkout" run: | @@ -44,16 +45,16 @@ jobs: with: java-version: 11 server-id: internal-nexus - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD + server-username: NEXUS_USERNAME + server-password: NEXUS_PASSWORD - name: "Publish package" run: | ~/ppl-run mvn PUBLISH \ --id "PUBLICATION" \ --lcd "$REPO_FOLDER" env: - MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} + NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} + NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} - name: "BOM Update" run: | ~/ppl-run bom update-bom \ From d539a1a3da9beaeec111db454fe338d438c4ea3c Mon Sep 17 00:00:00 2001 From: Walter Caffiero Date: Wed, 14 Jul 2021 14:20:54 +0200 Subject: [PATCH 5/7] Exp error reporting --- .github/workflows/pr.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 6cfb6f6b5..cad4fcddb 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -11,15 +11,15 @@ on: - develop env: + ENTANDO_OPT_USE_PPL_TAG: "v1.0.1" ENTANDO_OPT_FEATURES: ${{ secrets.ENTANDO_OPT_FEATURES }} GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }} GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }} - #ENTANDO_OPT_USE_PPL_TAG: ${{ secrets.ENTANDO_OPT_USE_PPL_TAG }} - ENTANDO_OPT_USE_PPL_TAG: "engine-exp" ENTANDO_OPT_REPO_BOM_URL: ${{ secrets.ENTANDO_OPT_REPO_BOM_URL }} PPL_CONTEXT: ${{ toJson(github) }} REPO_FOLDER: "local-checkout" - ENTANDO_OPT_LOG_LEVEL: ${{ secrets.ENTANDO_OPT_LOG_LEVEL }} + #ENTANDO_OPT_LOG_LEVEL: ${{ secrets.ENTANDO_OPT_LOG_LEVEL }} + ENTANDO_OPT_LOG_LEVEL: "###TRACE" jobs: @@ -126,9 +126,16 @@ jobs: key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - name: "Build and analyze" + id: SCAN if: steps.GATE.outputs.ENABLED == 'true' - run: | - ~/ppl-run mvn SONAR --lcd "$REPO_FOLDER" + run: | + ~/ppl-run mvn SONAR --id "SONAR" --lcd "$REPO_FOLDER" --out "$HOME/maven-result.log" + - name: "Full output" + if: ${{ always() }} + run: | + cat "$HOME/maven-result.log" + - name: "Clean SKIP-SONAR" + if: steps.GATE.outputs.ENABLED != 'true' run: | ~/ppl-run @pr-labels remove "skip-sonar" --id "CLEAN-SKIP-SONAR" # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From 1c26c636dbf0ee876c7d72da61892f6dd003f45c Mon Sep 17 00:00:00 2001 From: w-caffiero-entando <63636347+w-caffiero-entando@users.noreply.github.com> Date: Sun, 18 Jul 2021 19:46:32 +0200 Subject: [PATCH 6/7] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1112d1181..9a4a16428 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.entando entando-core-parent - 6.4.6 + 6.4.7 org.entando.entando entando-engine From 4f9cc65f398aa584e9e267f07d93171e76e5e852 Mon Sep 17 00:00:00 2001 From: w-caffiero-entando <63636347+w-caffiero-entando@users.noreply.github.com> Date: Sun, 18 Jul 2021 19:48:31 +0200 Subject: [PATCH 7/7] Update pr.yml --- .github/workflows/pr.yml | 2 -- .github/workflows/publication.yml | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a8c12f5ba..43574bd2f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -18,8 +18,6 @@ env: GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }} PPL_CONTEXT: ${{ toJson(github) }} REPO_FOLDER: "local-checkout" - #ENTANDO_OPT_LOG_LEVEL: ${{ secrets.ENTANDO_OPT_LOG_LEVEL }} - ENTANDO_OPT_LOG_LEVEL: "###TRACE" jobs: # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/.github/workflows/publication.yml b/.github/workflows/publication.yml index 61e1e61f2..099e26cdc 100644 --- a/.github/workflows/publication.yml +++ b/.github/workflows/publication.yml @@ -9,12 +9,11 @@ on: env: ENTANDO_OPT_USE_PPL_TAG: "v1.0.1" ENTANDO_OPT_FEATURES: ${{ secrets.ENTANDO_OPT_FEATURES }} - ENTANDO_OPT_USE_PPL_TAG: ${{ secrets.ENTANDO_OPT_USE_PPL_TAG }} - ENTANDO_OPT_REPO_BOM_URL: ${{ secrets.ENTANDO_OPT_REPO_BOM_URL }} ENTANDO_OPT_LOG_LEVEL: ${{ secrets.ENTANDO_OPT_LOG_LEVEL }} - PPL_CONTEXT: ${{ toJson(github) }} + ENTANDO_OPT_REPO_BOM_URL: ${{ secrets.ENTANDO_OPT_REPO_BOM_URL }} GIT_USER_NAME: ${{ secrets.GIT_USER_NAME }} GIT_USER_EMAIL: ${{ secrets.GIT_USER_EMAIL }} + PPL_CONTEXT: ${{ toJson(github) }} REPO_FOLDER: "local-checkout" jobs: