Skip to content

Commit

Permalink
Merge branch 'search-provider-interface' into closeSearchField
Browse files Browse the repository at this point in the history
* search-provider-interface:
  Migrate setup scripts to v1 (SAP#1325)
  Add pre commit hook (SAP#1344)
  Update npm dependencies in luigi-landingpage (SAP#1346)
  Added read-only keyword labels to documentation (SAP#1313)
  Cleanup the mock login page (SAP#1340)
  Enable nightly builds (SAP#1334)
  Fix input validation in fiddle idpmock (SAP#1309)
  change travis to fix only on push to master (SAP#1338)
  added selected state (SAP#1326)
  Migrate example apps to v1 (SAP#1311)
  Provide config in JS format to Fiddle e2e tests (SAP#1305)
  Add Youtube section to the landing page and Documentation (SAP#1315)
  Add a note about loadingIndicator to pageErrorHandler  (SAP#1310)
  Run compatibility tests in ci (SAP#1307)
  Add possibility to unload Luigi (SAP#1304)
  • Loading branch information
JohannesDoberer committed May 20, 2020
2 parents 9e7d1f5 + 3297aa9 commit b350ad4
Show file tree
Hide file tree
Showing 95 changed files with 10,578 additions and 15,777 deletions.
39 changes: 31 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ notifications:
slack:
secure: wiOchVgoiKNUikjCeIhsuv3Y5jolFud6ercdZdO3+JigQqkmoAC95f2jKTYEdplJWyJr8JY6z0+UJNceHyr5YJx/l1wpm6Zq+3H4dq/V0yUXH1uhw2eaTzweX2vjfw0bzewEdc1CGl4kSfdyTajnbKgt+mtnrAV9lPqiXYSOOJTu5BCFomi7u2GhAz1JjBK6P4Ar2jXm+oc81nYjj40P8bZFlA7Rjm0hNN42MMkKvnD8OHztL3EwezKHXlQW7fN4eOrhPOMbT3NRU72g9Nir+lfoKJlch1zPoHXQ7DRp41uGyHV/qfvfRLzXwxftZK6kdvzMe0eI0i1aIm0R6AE0bLphB2o/klJzyQpqSiQgETTH0qJN+3px2kddGrw7Me+UNC/1zZrt1MJfWf0h6WjXTsPDJf3ajLsn8OoIeBTRZbAb9as3UWQZcknuuMf8oGUzZkrZNMWYqo3py0+qWm4wSbWXWVUCgVAIYA6oEADwq37z59HySGkyHI4gEPzxsYODfCuvO4pJX1h4vEyH7w2IigwhDAPq5G4Vdez9ZFS96p/LSCF+iH8yWMy294u8wk5ofWUutFFv0JC45LQBXu51a2TeQkalwVn4DiuxxHE6jZieREw75YFjra4jpWsyziWkzshGT75NCra6cKAbNa4T8n6Pm3ogjEPeeWAO3psgSdo=


integration-testing: &integration-testing
if: repo = SAP/luigi AND type != cron
script:
- export CYPRESS_CACHE_FOLDER=$TRAVIS_BUILD_DIR/cypress-binary-cache
- ls $CYPRESS_CACHE_FOLDER
Expand Down Expand Up @@ -79,9 +79,21 @@ jobs:
- rm -rf ~/.npm/_cacache
- rm -rf $TRAVIS_BUILD_DIR/core/examples

#----- DOCU -----
# ----- NPM PUBLISH -----
- stage: 'Documentation & Tests'
name: 'Check Documentation'
name: 'Compatibility tests'
# run only when merging from release-v branch to master
if: repo = SAP/luigi AND branch = master AND type = push
script:
- bash ./scripts/testCompatibility.sh --tag latest || travis_terminate 1
before_cache:
- rm -rf ~/.npm/_logs
- rm -rf ~/.npm/_cacache
- rm -rf $TRAVIS_BUILD_DIR/../luigi-compatibility-testing # remove compatibility build cache

#----- DOCU -----
- name: 'Check Documentation'
if: repo = SAP/luigi AND type != cron
script:
- cd $TRAVIS_BUILD_DIR/scripts && npm ci
- cd $TRAVIS_BUILD_DIR && bash ./scripts/docuCheck.sh
Expand All @@ -91,8 +103,7 @@ jobs:

#----- WHITESOURCE -----
- name: 'Whitesource check'
if: repo = SAP/luigi AND branch = master
# if: repo = SAP/luigi AND (branch = master OR branch = release-v1)
if: repo = SAP/luigi AND branch = master AND type != cron
# Whitesource can't deal with symlinking, therefore we can't use lerna
script:
- 'if [ ! -z "${WHITESOURCE_APIKEY}" ]; then
Expand All @@ -114,14 +125,26 @@ jobs:
- name: 'Integration Testing 2'
<<: *integration-testing


# ----- NPM PUBLISH -----
- stage: 'Publish'
name: 'Publish to NPM'
# run only when merging from release-v branch to master
# if: repo = SAP/luigi AND (branch = master OR branch ~= ^release-v)
if: repo = SAP/luigi AND tag ~= ^v
# run only when a release in github was created
if: repo = SAP/luigi AND tag ~= ^v AND type != cron
script:
- bash ./scripts/npmPublish.sh
before_cache:
- rm -rf ~/.npm/_logs
- rm -rf ~/.npm/_cacache

- name: 'Nightly release'
if: type = cron
script:
- echo "//registry.npmjs.org/:_authToken=$NPM_LUI_AUTH_TOKEN" > ~/.npmrc
- cd $TRAVIS_BUILD_DIR/scripts && npm ci
- cd $TRAVIS_BUILD_DIR/scripts && NIGHTLY=true npm run release
- cd $TRAVIS_BUILD_DIR/scripts && npm run publish:nightly
- echo "" > ~/.npmrc
before_cache:
- rm -rf ~/.npm/_logs
- rm -rf ~/.npm/_cacache
2 changes: 0 additions & 2 deletions client/src/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ class Helpers {
}.bind(this);

window.addEventListener('message', helperListener);
window.onunload = () =>
window.removeEventListener('message', helperListener);
}

convertCustomMessageInternalToUser(internalMessage) {
Expand Down
24 changes: 12 additions & 12 deletions core/examples/luigi-example-angular/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,34 +25,34 @@
"src/favicon.ico",
"src/logo.svg",
{
"glob": "fiori-fundamentals.min.css",
"input": "node_modules/fiori-fundamentals/dist",
"output": "/fiori-fundamentals"
"glob": "fundamental-styles.css",
"input": "node_modules/fundamental-styles/dist",
"output": "/fundamental-styles"
},
{
"glob": "fonts/**",
"input": "node_modules/fiori-fundamentals/dist",
"output": "/fiori-fundamentals"
"glob": "**",
"input": "node_modules/@sap-theming/theming-base-content/content/Base/baseLib/sap_base_fiori/fonts",
"output": "/fonts"
},
{
"glob": "SAP-icons.*",
"input": "node_modules/fiori-fundamentals/dist",
"output": "/fiori-fundamentals"
"glob": "**",
"input": "node_modules/@sap-theming/theming-base-content/content/Base/baseLib/sap_fiori_3/fonts/",
"output": "/fonts"
},
{
"glob": "**",
"input": "node_modules/@kyma-project/luigi-core",
"input": "node_modules/@luigi-project/core",
"output": "/luigi-core"
},
{
"glob": "luigi-client*.js",
"input": "node_modules/@kyma-project/luigi-client",
"input": "node_modules/@luigi-project/client",
"output": "/luigi-client"
}
],
"styles": [
"src/styles.css",
"node_modules/fiori-fundamentals/dist/fiori-fundamentals.min.css"
"node_modules/fundamental-styles/dist/fundamental-styles.css"
],
"scripts": []
},
Expand Down
Loading

0 comments on commit b350ad4

Please sign in to comment.