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.

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

Test revert remove #613

Closed
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ff5d301
remove migrated applications to cloudoperators (#600)
ArtieReus May 8, 2024
31b0875
replace all * dependencies with URLs (assets-server) (#601)
andypf May 10, 2024
2926344
fix unit tests (#602)
andypf May 10, 2024
31d6365
ci: enable build-libs task again, to meet the star depenedncies from …
andypf May 10, 2024
30c08df
ci: fix importmap generator, support URLs in dependencies
andypf May 11, 2024
e758cfd
ci: do not change depVersion while generating importmap
andypf May 11, 2024
a1a88fb
ci: do not run task 'build-libs'
andypf May 13, 2024
f265c73
Navigation rework (#598)
franzheidl May 15, 2024
bc8aef9
ci: update pipeline
andypf May 16, 2024
5e0b557
ci: build assets individually
andypf May 16, 2024
5f3ae70
ci: add a task to run all build manually
andypf May 16, 2024
82f2d86
ci: build oauth from cloudoperators
andypf May 16, 2024
eef6c69
cleanup (#603)
ArtieReus May 21, 2024
d99d8ab
deploy juno-ui-components from cloudoperators (#605)
ArtieReus May 21, 2024
1e47ed3
[ci/workflow] build assets with the policy-engine from cloudoperators…
ArtieReus May 23, 2024
b25dce0
[dev] update dev base image to node 20
edda May 23, 2024
61d59df
[dashboard] add esbuild dev dependency
edda May 23, 2024
743d474
bump juno-ui-components to the version from cloudoperators (#607)
ArtieReus May 24, 2024
3ebb213
[migration] remove migrated libs (#608)
ArtieReus May 24, 2024
b3fcc83
[CI] Build messages-provider from cloudoperators and block PRs from m…
ArtieReus May 24, 2024
939f4ed
fix [CI] build all migrated apps and libs from cloudoperators. Block…
ArtieReus Jun 3, 2024
1d744eb
Revert "remove migrated applications to cloudoperators (#600)"
ArtieReus Jun 3, 2024
99b1006
Revert "[migration] remove migrated libs (#608)"
ArtieReus Jun 3, 2024
bb90c1d
npm install after revert deleted apps and libs
ArtieReus Jun 3, 2024
d3ff16b
Revert "Revert "[migration] remove migrated libs (#608)""
ArtieReus Jun 3, 2024
8ef2af2
Revert "Revert "remove migrated applications to cloudoperators (#600)""
ArtieReus Jun 3, 2024
5d6806e
Revert juno-ui-components and add from checkout
ArtieReus Jun 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
37 changes: 28 additions & 9 deletions .github/workflows/block-apps.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Block PRs on following apps supernova, huereka, greenhouse and greenhouse-management
name: Block PRs on apps and libs migrated to cloudoperators

on:
pull_request:
Expand Down Expand Up @@ -68,19 +68,38 @@ jobs:
evaluate-changes:
needs: changes
runs-on: [ubuntu-latest]
env:
APPS: "supernova heureka greenhouse greenhouse-management exampleapp template"
LIBS: "communicator oauth policy-engine messages-provider juno-ui-components url-state-provider url-state-router utils"
steps:
- name: Show inputs
run: |
echo apps: ${{ needs.changes.outputs.apps }}
echo libs: ${{ needs.changes.outputs.libs }}
echo app changes: ${{ needs.changes.outputs.app-changes }}
echo lib changes: ${{ needs.changes.outputs.lib-changes }}
- name: Check if any of the apps are supernova, huereka, greenhouse or greenhouse-management
if: |
contains(needs.changes.outputs.app-changes, 'supernova') ||
contains(needs.changes.outputs.app-changes, 'huereka') ||
contains(needs.changes.outputs.app-changes, 'greenhouse') ||
contains(needs.changes.outputs.app-changes, 'greenhouse-management')

- name: Check if changes belong to restricted apps or libs
id: check-changes
run: |
echo "::error not allowed to make changes to supernova, huereka, greenhouse or greenhouse-management apps"
exit 1
check_changes() {
local changes=$1
local list=$2
local type=$3
for item in $list; do
if [[ $changes == *"$item"* ]]; then
echo "Not allowed to make changes to specified $type: $item"
exit 1
fi
done
echo "No restricted changes found in $type"
return 0
}

app_changes="${{ needs.changes.outputs.app-changes }}"
lib_changes="${{ needs.changes.outputs.lib-changes }}"

check_changes "$app_changes" "$APPS" "app"
check_changes "$lib_changes" "$LIBS" "lib"

echo "Changes are allowed."
2 changes: 2 additions & 0 deletions apps/assets-overview/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Assets Overview

[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)

This app displays all available Juno apps using the manifest.json file. The manifest.json file is located on the assets server and contains various data, including the path to the build of the app.

This app uses the same techniques as all Juno apps and is integrated in the same way via widget-loader. It serves both as an overview of available apps and as an example of what such an app can look like.
Expand Down
2 changes: 1 addition & 1 deletion apps/assets-overview/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = {
testEnvironment: "jsdom",
setupFilesAfterEnv: ["<rootDir>/setupTests.js"],
transformIgnorePatterns: [
"node_modules/(?!(juno-ui-components|messages-provider)/)",
"node_modules/(?!(juno-ui-components|messages-provider|url-state-router|utils)/)",
],
moduleNameMapper: {
// Jest currently doesn't support resources with query parameters.
Expand Down
20 changes: 10 additions & 10 deletions apps/assets-overview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
"github-markdown-css": "^5.1.0",
"jest": "^29.3.1",
"jest-environment-jsdom": "^29.3.1",
"juno-ui-components": "*",
"juno-ui-components": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"luxon": "3.3.0",
"messages-provider": "*",
"messages-provider": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"postcss": "^8.4.21",
"postcss-url": "^10.1.3",
"prop-types": "15.8.1",
Expand All @@ -45,10 +45,10 @@
"sass": "^1.60.0",
"shadow-dom-testing-library": "^1.7.1",
"tailwindcss": "^3.3.1",
"url-state-provider": "*",
"url-state-router": "*",
"url-state-provider": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"url-state-router": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"util": "^0.12.4",
"utils": "*",
"utils": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"zustand": "4.3.7"
},
"scripts": {
Expand All @@ -60,15 +60,15 @@
"peerDependencies": {
"@tanstack/react-query": "4.28.0",
"custom-event-polyfill": "1.0.7",
"juno-ui-components": "*",
"juno-ui-components": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"luxon": "3.3.0",
"messages-provider": "*",
"messages-provider": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"prop-types": "15.8.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"url-state-provider": "*",
"url-state-router": "*",
"utils": "*",
"url-state-provider": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"url-state-router": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"utils": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"zustand": "4.3.7"
},
"appProps": {
Expand Down
2 changes: 2 additions & 0 deletions apps/auth/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Auth App

[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)

This app implements the OIDC flow to login the user.

## Usage
Expand Down
10 changes: 5 additions & 5 deletions apps/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
"autoprefixer": "^10.4.2",
"babel-jest": "^29.3.1",
"babel-plugin-transform-import-meta": "^2.2.0",
"communicator": "*",
"communicator": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"custom-event-polyfill": "^1.0.7",
"esbuild": "^0.17.12",
"interweave": "^13.0.0",
"jest": "^29.3.1",
"jest-environment-jsdom": "^29.3.1",
"juno-ui-components": "*",
"oauth": "*",
"juno-ui-components": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"oauth": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"postcss": "^8.4.21",
"postcss-url": "^10.1.3",
"prop-types": "^15.8.1",
Expand All @@ -51,8 +51,8 @@
},
"peerDependencies": {
"custom-event-polyfill": "^1.0.7",
"juno-ui-components": "latest",
"oauth": "*",
"juno-ui-components": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"oauth": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"prop-types": "^15.8.1",
"react": "18.2.0",
"react-dom": "^18.2.0"
Expand Down
2 changes: 2 additions & 0 deletions apps/dashboard/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Global Dashboard

[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)

This app implements the global landing apge for Converged Cloud (CC). It offers a region and domain selection so that the user can navigate directly to the CC Dashboard in the desired region.
5 changes: 3 additions & 2 deletions apps/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
"autoprefixer": "^10.4.2",
"babel-jest": "^29.3.1",
"babel-plugin-transform-import-meta": "^2.2.0",
"esbuild": "^0.19.5",
"jest": "^29.3.1",
"jest-environment-jsdom": "^29.3.1",
"juno-ui-components": "*",
"juno-ui-components": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"luxon": "^2.3.0",
"postcss": "^8.4.21",
"postcss-url": "^10.1.3",
Expand All @@ -47,7 +48,7 @@
},
"peerDependencies": {
"custom-event-polyfill": "^1.0.7",
"juno-ui-components": "*",
"juno-ui-components": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"luxon": "^2.3.0",
"prop-types": "^15.8.1",
"react": "18.2.0",
Expand Down
4 changes: 3 additions & 1 deletion apps/exampleapp/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ module.exports = {
transform: { "\\.[jt]sx?$": "babel-jest" },
testEnvironment: "jsdom",
setupFilesAfterEnv: ["<rootDir>/setupTests.js"],
transformIgnorePatterns: ["node_modules/(?!(juno-ui-components)/)"],
transformIgnorePatterns: [
"node_modules/(?!(juno-ui-components|oauth|messages-provider|utils)/)",
],
moduleNameMapper: {
// Jest currently doesn't support resources with query parameters.
// Therefore we add the optional query parameter matcher at the end
Expand Down
20 changes: 10 additions & 10 deletions apps/exampleapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"esbuild": "^0.17.19",
"jest": "^29.3.1",
"jest-environment-jsdom": "^29.3.1",
"juno-ui-components": "*",
"juno-ui-components": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"luxon": "^2.3.0",
"messages-provider": "*",
"oauth": "*",
"messages-provider": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"oauth": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"postcss": "^8.4.21",
"postcss-url": "^10.1.3",
"prop-types": "^15.8.1",
Expand All @@ -42,9 +42,9 @@
"sass": "^1.60.0",
"shadow-dom-testing-library": "^1.7.1",
"tailwindcss": "^3.3.1",
"url-state-provider": "*",
"url-state-provider": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"util": "^0.12.4",
"utils": "*",
"utils": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"zustand": "4.3.7"
},
"scripts": {
Expand All @@ -55,15 +55,15 @@
"peerDependencies": {
"@tanstack/react-query": "4.28.0",
"custom-event-polyfill": "^1.0.7",
"juno-ui-components": "*",
"juno-ui-components": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"luxon": "^2.3.0",
"messages-provider": "*",
"oauth": "*",
"messages-provider": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"oauth": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"prop-types": "^15.8.1",
"react": "18.2.0",
"react-dom": "^18.2.0",
"url-state-provider": "*",
"utils": "*",
"url-state-provider": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"utils": "https://assets.juno.global.cloud.sap/libs/[email protected]/package.tgz",
"zustand": "4.3.7"
},
"importmapExtras": {
Expand Down
Loading
Loading