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

ENG-4917 merge release 7.2 branch into develop #1487

Merged
merged 34 commits into from
May 29, 2023
Merged

ENG-4917 merge release 7.2 branch into develop #1487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
8d0ecb4
Merge pull request #1469 from entando/develop
nicpuddu Apr 12, 2023
2eaa625
ENGPM-540 version bump app-builder
ichalagashvili Apr 12, 2023
696a252
ENGPM-540 version bump app-builder without version change
ichalagashvili Apr 12, 2023
070e049
Merge pull request #1470 from entando/ENGPM-540-rc1
nicpuddu Apr 12, 2023
08a10df
ENG-4626 added removed labels on Dashboard
DMinnai Apr 14, 2023
dd0843e
ENG-4626 added labels for PT
DMinnai Apr 14, 2023
909951e
Merge pull request #1473 from entando/ENG-4626-regression-dashboard
DMinnai Apr 14, 2023
614f473
ENG-4734 implement content menu hiding logic
chalagashvili Apr 6, 2023
53b7296
Merge pull request #1464 from entando/ENG-4734
ichalagashvili Apr 19, 2023
ef36c8c
ENG-4758-fix for 403 error
DMinnai Apr 20, 2023
586e82c
ENG-4758_error_403
DMinnai Apr 20, 2023
1bfb671
ENG-4748 set tenant as unauthorized
DMinnai Apr 20, 2023
6e95ccf
ENG-4748 set tenant as unauthorized
DMinnai Apr 20, 2023
1a0cd2f
Merge pull request #1476 from entando/ENG-4758_error_403
DMinnai Apr 20, 2023
23e8b65
ENG-4058 fix profile type composite attribute
ichalagashvili Apr 21, 2023
394ca92
ENG-4734 send custom events when preferences are changed
ichalagashvili Apr 25, 2023
522669a
ENGPM-540 bump up for release pr
ichalagashvili Apr 28, 2023
4c52532
Merge pull request #1481 from entando/ENGPM-540_another_release
nicpuddu Apr 28, 2023
7d24c0a
Merge pull request #1479 from entando/ENG-4734_send_custom_events
nicpuddu May 8, 2023
06e732b
ENG-4851 mute warnings and fix tour error
ichalagashvili May 11, 2023
d8d5383
ENG-4837 fix initial tab loading
ichalagashvili May 11, 2023
973714d
ENG-4837 fix overriding of the state for reference map
ichalagashvili May 12, 2023
f137338
Merge pull request #1485 from entando/ENG-4837_no_fetch
ichalagashvili May 12, 2023
30e6116
Merge pull request #1484 from entando/ENG-4851_fix_console
ichalagashvili May 12, 2023
a62a6ee
Merge pull request #1480 from entando/ENG-4058_composite_fix
ichalagashvili May 12, 2023
1bb160d
ENG-4884 support legacy menu wizard navigation
ichalagashvili May 19, 2023
6db217a
ENG-4884 support legacy menu wizard navigation
ichalagashvili May 22, 2023
edd0b95
ENG-4884 fix incorrect selector
ichalagashvili May 22, 2023
f40d41b
Merge pull request #1494 from entando/ENG-4884_wizard_pr
ichalagashvili May 23, 2023
6c850fc
ENGPM-545 bump up 7.2.1 release version
ichalagashvili May 25, 2023
5d8f4e3
Merge pull request #1497 from entando/ENGPM-545_release
ichalagashvili May 25, 2023
d5f30ae
ENG-4915 upgraded to ppl 1.4.2
entgigi May 26, 2023
0e328d7
ENG-4915 fix to package json
entgigi May 26, 2023
a61fc5e
Merge pull request #1499 from entando/ENG-4915_Upgrade-appBuilder-pip…
entgigi May 26, 2023
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
13 changes: 6 additions & 7 deletions .github/workflows/ga-publication.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ on:
- created

env:
ENTANDO_OPT_USE_PPL_TAG: "v1.2.0"
ENTANDO_OPT_USE_PPL_TAG: "v1.4.2"
ENTANDO_OPT_DATA_REPO: "${{ secrets.ENTANDO_OPT_DATA_REPO }}"
ENTANDO_OPT_DATA_REPO_TOKEN: "${{ secrets.ENTANDO_OPT_DATA_REPO_TOKEN }}"
ENTANDO_OPT_ENVIRONMENT_NAMES: "${{ secrets.ENTANDO_OPT_ENVIRONMENT_NAMES }}"
ENTANDO_OPT_FEATURES: "${{ secrets.ENTANDO_OPT_FEATURES }}"
ENTANDO_OPT_GLOBAL_FEATURES: "${{ secrets.ENTANDO_OPT_GLOBAL_FEATURES }}"
ENTANDO_OPT_LOG_LEVEL: "${{ secrets.ENTANDO_OPT_LOG_LEVEL }}"
ENTANDO_OPT_REPO_BOM_URL: "${{ secrets.ENTANDO_OPT_REPO_BOM_URL }}"
ENTANDO_OPT_CUSTOM_ENV: "${{ secrets.ENTANDO_OPT_CUSTOM_ENV }}"
PPL_CONTEXT: ${{ toJson(github) }}
GIT_USER_NAME: "${{ secrets.GIT_USER_NAME }}"
GIT_USER_EMAIL: "${{ secrets.GIT_USER_EMAIL }}"
LOCAL_CLONE_DIR: "local-checkout"

jobs:
Expand All @@ -23,7 +23,6 @@ jobs:
# GA PUBLICATION
ga-publish:
env:
ENTANDO_OPT_MAVEN_REPO_GA: ${{ secrets.ENTANDO_OPT_MAVEN_REPO_GA }}
ENTANDO_BOT_TOKEN: ${{ secrets.ENTANDO_BOT_TOKEN }}
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -53,10 +52,10 @@ jobs:
gpg-passphrase: MAVEN_GPG_PASSPHRASE
- name: "Publish package to GA"
run: |
~/ppl-run mvn GA-PUBLICATION \
~/ppl-run npm GA-PUBLICATION \
--id "GA-PUBLICATION" \
--lcd "$LOCAL_CLONE_DIR"
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
11 changes: 6 additions & 5 deletions .github/workflows/post-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ on:
- release/*

env:
ENTANDO_OPT_USE_PPL_TAG: "v1.2.0"
ENTANDO_OPT_USE_PPL_TAG: "v1.4.2"
ENTANDO_OPT_DATA_REPO: "${{ secrets.ENTANDO_OPT_DATA_REPO }}"
ENTANDO_OPT_DATA_REPO_TOKEN: "${{ secrets.ENTANDO_OPT_DATA_REPO_TOKEN }}"
ENTANDO_OPT_ENVIRONMENT_NAMES: "${{ secrets.ENTANDO_OPT_ENVIRONMENT_NAMES }}"
ENTANDO_OPT_FEATURES: "${{ secrets.ENTANDO_OPT_FEATURES }}"
ENTANDO_OPT_GLOBAL_FEATURES: "${{ secrets.ENTANDO_OPT_GLOBAL_FEATURES }}"
ENTANDO_OPT_LOG_LEVEL: "${{ secrets.ENTANDO_OPT_LOG_LEVEL }}"
ENTANDO_OPT_REPO_BOM_URL: "${{ secrets.ENTANDO_OPT_REPO_BOM_URL }}"
ENTANDO_OPT_CUSTOM_ENV: "${{ secrets.ENTANDO_OPT_CUSTOM_ENV }}"
PPL_CONTEXT: ${{ toJson(github) }}
GIT_USER_NAME: "${{ secrets.GIT_USER_NAME }}"
GIT_USER_EMAIL: "${{ secrets.GIT_USER_EMAIL }}"
LOCAL_CLONE_DIR: "local-checkout"


Expand All @@ -38,4 +39,4 @@ jobs:
--token "${{ secrets.ENTANDO_BOT_TOKEN }}" \
.. publication tag-git-version \
--id "TAG-VERSION" \
--lcd "$LOCAL_CLONE_DIR"
--lcd "$LOCAL_CLONE_DIR"
60 changes: 25 additions & 35 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,22 @@ on:
- release/*

env:
ENTANDO_OPT_USE_PPL_TAG: "v1.2.0"
ENTANDO_OPT_USE_PPL_TAG: "v1.4.2"
ENTANDO_OPT_DATA_REPO: "${{ secrets.ENTANDO_OPT_DATA_REPO }}"
ENTANDO_OPT_DATA_REPO_TOKEN: "${{ secrets.ENTANDO_OPT_DATA_REPO_TOKEN }}"
ENTANDO_OPT_ENVIRONMENT_NAMES: "${{ secrets.ENTANDO_OPT_ENVIRONMENT_NAMES }}"
ENTANDO_OPT_FEATURES: "${{ secrets.ENTANDO_OPT_FEATURES }}"
ENTANDO_OPT_GLOBAL_FEATURES: "${{ secrets.ENTANDO_OPT_GLOBAL_FEATURES }}"
ENTANDO_OPT_LOG_LEVEL: "${{ secrets.ENTANDO_OPT_LOG_LEVEL }}"
ENTANDO_OPT_REPO_BOM_URL: "${{ secrets.ENTANDO_OPT_REPO_BOM_URL }}"
ENTANDO_OPT_CUSTOM_ENV: "${{ secrets.ENTANDO_OPT_CUSTOM_ENV }}"
ENTANDO_OPT_OKD_LOGIN: "${{ secrets.ENTANDO_OPT_OKD_LOGIN }}"
ENTANDO_OPT_IMAGE_REGISTRY_OVERRIDE: "${{ secrets.ENTANDO_OPT_IMAGE_REGISTRY_OVERRIDE }}"
ENTANDO_OPT_DOCKER_ORG: "${{ secrets.ENTANDO_OPT_DOCKER_ORG }}"
ENTANDO_OPT_TEST_NAMESPACE: "${{ secrets.ENTANDO_OPT_TEST_NAMESPACE }}"
ENTANDO_OPT_HELM_CLI_URL: "${{ secrets.ENTANDO_OPT_HELM_CLI_URL }}"
PPL_CONTEXT: ${{ toJson(github) }}
GIT_USER_NAME: "${{ secrets.GIT_USER_NAME }}"
GIT_USER_EMAIL: "${{ secrets.GIT_USER_EMAIL }}"
LOCAL_CLONE_DIR: "local-checkout"
SNYK_ORG: "entando-ixc"

jobs:
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# PREPARE

prepare:
runs-on: ubuntu-latest
outputs:
Expand All @@ -45,8 +39,8 @@ jobs:
run: |
${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}
~/ppl-run \
.. @checkout-branch --lcd "$LOCAL_CLONE_DIR" \
.. status-report \
.. @checkout-branch pr --lcd "$LOCAL_CLONE_DIR" \
.. @setup-feature-flags "PR_PREFLIGHT_CHECKS" "BOM_CHECK" "BOM" \
.. @setup-features-list "SCAN_MATRIX" --prefix "MTX-NPM-,MTX-SCAN-" \
;
Expand All @@ -59,23 +53,20 @@ jobs:
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# FULL-BUILD

full-build:
needs: [ 'prepare' ]
runs-on: ubuntu-latest
env:
ENTANDO_BOT_TOKEN: ${{ secrets.ENTANDO_BOT_TOKEN }}
ENTANDO_OPT_OKD_LOGIN_URL: "${{ secrets.ENTANDO_OPT_OKD_LOGIN_URL }}"
ENTANDO_BOT_TOKEN: "${{ secrets.ENTANDO_BOT_TOKEN }}"
ENTANDO_OPT_OKD_LOGIN_TOKEN: "${{ secrets.ENTANDO_OPT_OKD_LOGIN_TOKEN }}"
ENTANDO_OPT_OKD_LOGIN_NAMESPACE: "${{ secrets.ENTANDO_OPT_OKD_LOGIN_NAMESPACE }}"
ENTANDO_OPT_OKD_LOGIN_INSECURE: "${{ secrets.ENTANDO_OPT_OKD_LOGIN_INSECURE }}"
ENTANDO_OPT_OKD_CLI_URL: "${{ secrets.ENTANDO_OPT_OKD_CLI_URL }}"
steps:
#~ CHECKOUT
- name: "CHECKOUT"
id: CHECKOUT
run: |
${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}
~/ppl-run checkout-branch pr \
~/ppl-run checkout-branch \
--lcd "$LOCAL_CLONE_DIR" \
--token "$ENTANDO_BOT_TOKEN" \
;
Expand All @@ -91,13 +82,6 @@ jobs:
path: ~/.npm
key: ${{ runner.os }}-npm
restore-keys: ${{ runner.os }}-npm
#~ BUILD CACHE
- name: "Cache Build Dir"
id: build-cache
uses: actions/cache@v2
with:
path: "${{ env.LOCAL_CLONE_DIR }}/build/"
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
#~ BUILD
- name: "FULL BUILD"
env:
Expand All @@ -119,7 +103,7 @@ jobs:
fail-fast: false
matrix:
scan-type: ${{fromJson(needs.prepare.outputs.SCAN_MATRIX)}}

steps:
#~ CHECKOUT
- name: "CHECKOUT"
Expand All @@ -142,20 +126,26 @@ jobs:
${{ runner.os }}-npm-matrix-${{ matrix.scan-type }}
${{ runner.os }}-npm-matrix-
${{ runner.os }}-npm-
#~ BUILD CACHE
- name: "Cache Build Dir"
id: build-cache
uses: actions/cache@v2
with:
path: "${{ env.LOCAL_CLONE_DIR }}/build/"
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
#~ SCAN
- name: "Run the matrix step ${{ matrix.scan-type }}"
run: |
SCAN_TYPE="${{ matrix.scan-type }}"
case "$SCAN_TYPE" in
MTX-MVN-SCAN-SONAR)
export GITHUB_TOKEN="${{ secrets.GITHUB_TOKEN }}"
export SONAR_TOKEN="${{ secrets.SONAR_TOKEN }}"
export ENTANDO_OPT_SONAR_PROJECT_KEY="${{ secrets.ENTANDO_OPT_SONAR_PROJECT_KEY }}"
;;
MTX-SCAN-SNYK)
export SNYK_TOKEN="${{ secrets.SNYK_TOKEN }}"
;;
MTX-MVN-POST-DEPLOYMENT-TESTS)
export ENTANDO_OPT_OKD_LOGIN_TOKEN="${{ secrets.ENTANDO_OPT_OKD_LOGIN_TOKEN }}"
export ENTANDO_OPT_IMAGE_REGISTRY_CREDENTIALS="${{ secrets.ENTANDO_OPT_IMAGE_REGISTRY_CREDENTIALS }}"
export ENTANDO_OPT_DOCKER_USERNAME="${{ secrets.ENTANDO_OPT_DOCKER_USERNAME }}"
export ENTANDO_OPT_DOCKER_PASSWORD="${{ secrets.ENTANDO_OPT_DOCKER_PASSWORD }}"
export ENTANDO_OPT_TEST_TLS_CRT="${{ secrets.ENTANDO_OPT_TEST_TLS_CRT }}"
export ENTANDO_OPT_TEST_TLS_KEY="${{ secrets.ENTANDO_OPT_TEST_TLS_KEY }}"
;;
esac
~/ppl-run generic "$SCAN_TYPE" mvn --id "$SCAN_TYPE" --lcd "$LOCAL_CLONE_DIR"
~/ppl-run generic "$SCAN_TYPE" npm --id "$SCAN_TYPE" --lcd "$LOCAL_CLONE_DIR"
133 changes: 107 additions & 26 deletions .github/workflows/publication.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,32 @@
name: Internal Snapshot Publication
name: PUB

on:
push:
tags:
- 'v*'

env:
ENTANDO_OPT_USE_PPL_TAG: "v1.2.0"
ENTANDO_OPT_USE_PPL_TAG: "v1.4.2"
ENTANDO_OPT_DATA_REPO: "${{ secrets.ENTANDO_OPT_DATA_REPO }}"
ENTANDO_OPT_DATA_REPO_TOKEN: "${{ secrets.ENTANDO_OPT_DATA_REPO_TOKEN }}"
ENTANDO_OPT_ENVIRONMENT_NAMES: "${{ secrets.ENTANDO_OPT_ENVIRONMENT_NAMES }}"
ENTANDO_OPT_FEATURES: "${{ secrets.ENTANDO_OPT_FEATURES }}"
ENTANDO_OPT_GLOBAL_FEATURES: "${{ secrets.ENTANDO_OPT_GLOBAL_FEATURES }}"
ENTANDO_OPT_LOG_LEVEL: "${{ secrets.ENTANDO_OPT_LOG_LEVEL }}"
ENTANDO_OPT_REPO_BOM_URL: "${{ secrets.ENTANDO_OPT_REPO_BOM_URL }}"
ENTANDO_OPT_CUSTOM_ENV: "${{ secrets.ENTANDO_OPT_CUSTOM_ENV }}"
PPL_CONTEXT: ${{ toJson(github) }}
GIT_USER_NAME: "${{ secrets.GIT_USER_NAME }}"
GIT_USER_EMAIL: "${{ secrets.GIT_USER_EMAIL }}"
LOCAL_CLONE_DIR: "local-checkout"


jobs:
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# INTERNAL PUBLICATION
internal-publication:
# PUBLICATION

publication:
outputs:
POST_PUB_DOCKER_SCAN: ${{ steps.START.outputs.POST_PUB_DOCKER_SCAN }}
POST_DEP_TESTS: ${{ steps.START.outputs.POST_DEP_TESTS }}
env:
ENTANDO_BOT_TOKEN: ${{ secrets.ENTANDO_BOT_TOKEN }}
runs-on: ubuntu-latest
Expand All @@ -33,15 +37,15 @@ jobs:
${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}
~/ppl-run \
.. status-report \
.. @setup-feature-flags "PR_FORMAT_CHECK" "BOM_CHECK" "BOM" \
.. @setup-feature-flags "PR_FORMAT_CHECK" "BOM_CHECK" "BOM" "POST_PUB_DOCKER_SCAN" "POST_DEP_TESTS" \
;
#~ CHECKOUT
- name: "CHECKOUT"
id: CHECKOUT
run: |
~/ppl-run \
.. checkout-branch --id "CHECKOUT FOR NEXUS PUBLICATION" \
--lcd "$LOCAL_CLONE_DIR" \
.. checkout-branch --id "CHECKOUT FOR PUBLICATION" \
--lcd "$LOCAL_CLONE_DIR" \
--token "$ENTANDO_BOT_TOKEN" \
.. pr-preflight-checks --only flags --lcd "$LOCAL_CLONE_DIR" \
;
Expand All @@ -57,18 +61,13 @@ jobs:
with:
path: ~/.npm
key: ${{ runner.os }}-npm
#~ BUILD CACHE
- name: "Cache Build Dir"
id: build-cache
uses: actions/cache@v2
with:
path: "${{ env.LOCAL_CLONE_DIR }}/build/"
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
#~ PUBLISH PACKAGE
#~ PUBLISH THE ARTIFACT
- name: "Publish package"
run: |
~/ppl-run generic PUBLISH \
--id "PUBLICATION" \
export ENTANDO_OPT_AWS_ACCESS_KEY_ID="${{ secrets.ENTANDO_OPT_AWS_ACCESS_KEY_ID }}"
export ENTANDO_OPT_AWS_SECRET_ACCESS_KEY="${{ secrets.ENTANDO_OPT_AWS_SECRET_ACCESS_KEY }}"

~/ppl-run generic PUBLISH --id "PUBLICATION" \
--lcd "$LOCAL_CLONE_DIR"
env:
NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
Expand All @@ -82,14 +81,96 @@ jobs:
--lcd "$LOCAL_CLONE_DIR" \
--token "$ENTANDO_BOT_TOKEN" \
;
#~ PUBLISH TO DOCKER IMAGE
#~ PUBLISH TO DOCKER
- name: "Publish docker"
run: |
export ENTANDO_OPT_DOCKER_PASSWORD="${{ secrets.ENTANDO_OPT_DOCKER_PASSWORD }}"
export ENTANDO_OPT_DOCKER_ALT_LOGIN_URL="${{ secrets.ENTANDO_OPT_DOCKER_ALT_LOGIN }}"
export ENTANDO_OPT_DOCKER_ALT_USERNAME="${{ secrets.ENTANDO_OPT_DOCKER_ALT_USERNAME }}"
export ENTANDO_OPT_DOCKER_ALT_PASSWORD="${{ secrets.ENTANDO_OPT_DOCKER_ALT_PASSWORD }}"

~/ppl-run docker publish --id "PUBLISH-DOCKER" --lcd "$LOCAL_CLONE_DIR"

# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# POST PUB JOBS

post-pub-docker-scan:
needs: [ 'publication' ]
if: needs.publication.outputs.POST_PUB_DOCKER_SCAN == 'true'
runs-on: ubuntu-latest
steps:
#~ CHECKOUT
- name: "CHECKOUT"
id: CHECKOUT
run: |
${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}
~/ppl-run \
.. checkout-branch --id "CHECKOUT FOR PUBLICATION" \
--lcd "$LOCAL_CLONE_DIR" \
--token "$ENTANDO_BOT_TOKEN" \
.. pr-preflight-checks --only flags --lcd "$LOCAL_CLONE_DIR" \
;
#~ NODE
- name: "Set up Node 14"
uses: actions/setup-node@v2
with:
node-version: 14.x
#~ NPM CACHE
- name: "Cache NPM Packages"
id: package-cache
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-npm
#~ SCAN
- name: "Scan docker"
env:
ENTANDO_OPT_SNYK_ORG: "${{ secrets.ENTANDO_OPT_SNYK_ORG }}"
SNYK_TOKEN: "${{ secrets.SNYK_TOKEN }}"
ENTANDO_OPT_DOCKER_BUILDS: "${{ secrets.ENTANDO_OPT_DOCKER_BUILDS }}"
ENTANDO_OPT_DOCKER_ORG: "${{ secrets.ENTANDO_OPT_DOCKER_ORG }}"
ENTANDO_OPT_DOCKER_USERNAME: "${{ secrets.ENTANDO_OPT_DOCKER_USERNAME }}"
ENTANDO_OPT_DOCKER_PASSWORD: "${{ secrets.ENTANDO_OPT_DOCKER_PASSWORD }}"
run: |
~/ppl-run docker publish "$ENTANDO_OPT_DOCKER_BUILDS"\
--id "PUBLISH-DOCKER" \
--lcd "$LOCAL_CLONE_DIR"
~/ppl-run docker scan --id "SCAN-DOCKER" --lcd "$LOCAL_CLONE_DIR"

post-dep-tests:
needs: [ 'publication' ]
if: needs.publication.outputs.POST_DEP_TESTS == 'true'
runs-on: ubuntu-latest
steps:
#~ CHECKOUT
- name: "CHECKOUT"
id: CHECKOUT
run: |
${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}
~/ppl-run \
.. checkout-branch --id "CHECKOUT FOR PUBLICATION" \
--lcd "$LOCAL_CLONE_DIR" \
--token "$ENTANDO_BOT_TOKEN" \
.. pr-preflight-checks --only flags --lcd "$LOCAL_CLONE_DIR" \
;
#~ NODE
- name: "Set up Node 14"
uses: actions/setup-node@v2
with:
node-version: 14.x
#~ NPM CACHE
- name: "Cache NPM Packages"
id: package-cache
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-npm
#~ PUBLISH THE ARTIFACT
- name: "Post deployment tests"
run: |
${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}

export ENTANDO_OPT_OKD_LOGIN_TOKEN="${{ secrets.ENTANDO_OPT_OKD_LOGIN_TOKEN }}"
export ENTANDO_OPT_IMAGE_REGISTRY_CREDENTIALS="${{ secrets.ENTANDO_OPT_IMAGE_REGISTRY_CREDENTIALS }}"
export ENTANDO_OPT_DOCKER_USERNAME="${{ secrets.ENTANDO_OPT_DOCKER_USERNAME }}"
export ENTANDO_OPT_DOCKER_PASSWORD="${{ secrets.ENTANDO_OPT_DOCKER_PASSWORD }}"
export ENTANDO_OPT_TEST_TLS_CRT="${{ secrets.ENTANDO_OPT_TEST_TLS_CRT }}"
export ENTANDO_OPT_TEST_TLS_KEY="${{ secrets.ENTANDO_OPT_TEST_TLS_KEY }}"

~/ppl-run generic "POST-DEP-TESTS" --id "POST_DEP_TESTS" --lcd "$LOCAL_CLONE_DIR"
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LABEL name="Entando App Builder" \
maintainer="dev@entando.com" \
vendor="Entando Inc." \
version="v${VERSION}" \
release="7.2.0" \
release="7.2.1" \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you could rewrite version as 7.3.0 in this PR to not open another PR ...

summary="Entando App Builder" \
description="The Entando App Builder is the front end environment to interact with the micro frontends, the WCMS, and other Entando components"

Expand Down
Loading