Skip to content

Commit a047251

Browse files
yashmeet29yashmeet29
committed
Move leading app to SDM plugin & workflow files update to read these apps from SDM plugin
1 parent 5c91450 commit a047251

436 files changed

Lines changed: 57879 additions & 92 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/SAPUI5_Version_Monitoring.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
pull-requests: write
1515

1616
steps:
17-
- name: Checkout the develop_deploy branch
17+
- name: Checkout the develop branch
1818
uses: actions/checkout@v6
1919
with:
20-
ref: develop_deploy
20+
ref: develop
2121

2222
- name: Install dependencies
2323
run: |
@@ -26,9 +26,9 @@ jobs:
2626
id: run_script
2727
run: |
2828
#!/bin/bash
29-
29+
3030
# Define the target file
31-
FILE_PATH="cap-notebook/demoapp/app/index.html"
31+
FILE_PATH="app/single-tenant/central-space/demoapp/app/index.html"
3232
3333
# Function to get the latest version and its corresponding latest patch version
3434
fetch_versions() {
@@ -107,5 +107,5 @@ jobs:
107107
Current Version: ${{ steps.run_script.outputs.current_version }}
108108
Latest patch version: ${{ steps.run_script.outputs.latest_version }}
109109
branch: 'update-sapui5-version'
110-
base: develop_deploy
110+
base: develop
111111
assignees: yashmeet29

‎.github/workflows/cfdeploy.yml‎

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,6 @@ jobs:
5353
mvn clean install -P unit-tests -DskipIntegrationTests
5454
echo "✅ Build and packaging completed successfully!"
5555
56-
- name: Verify and Checkout Deploy Branch 🔄
57-
run: |
58-
git fetch origin
59-
echo "📂 Verifying 'local_deploy' branch..."
60-
if git rev-parse --verify origin/local_deploy; then
61-
git checkout local_deploy
62-
echo "✅ Branch checked out successfully!"
63-
else
64-
echo "❌ Branch 'local_deploy' not found. Please verify the branch name."
65-
exit 1
66-
fi
67-
6856
- name: Set REPOSITORY_ID 🔍
6957
id: set_repository_id
7058
run: |
@@ -88,7 +76,7 @@ jobs:
8876
echo "Current Branch: 📂"
8977
git branch
9078
pwd
91-
cd /home/runner/work/sdm/sdm/cap-notebook/demoapp/app
79+
cd /home/runner/work/sdm/sdm/app/single-tenant/personal-space/demoapp/app
9280
echo "Changed to app directory 📂"
9381
pwd
9482
@@ -143,25 +131,13 @@ jobs:
143131
java-version: 21
144132
distribution: 'temurin'
145133

146-
- name: Verify and Checkout Deploy Branch 🔄
147-
run: |
148-
git fetch origin
149-
echo "📂 Verifying 'develop_deploy' branch..."
150-
if git rev-parse --verify origin/develop_deploy; then
151-
git checkout develop_deploy
152-
echo "✅ Branch checked out successfully!"
153-
else
154-
echo "❌ Branch 'develop_deploy' not found. Please verify the branch name."
155-
exit 1
156-
fi
157-
158134
- name: Override cds.services.version (runtime only)
159135
if: ${{ github.event.inputs.cds_services_version != '' }}
160136
env:
161137
TARGET_CDS_SERVICES_VERSION: ${{ github.event.inputs.cds_services_version }}
162138
run: |
163139
echo "Override requested: cds.services.version -> ${TARGET_CDS_SERVICES_VERSION}"
164-
FILES=$(grep -Rl "<cds.services.version>" . | grep pom.xml || true)
140+
FILES=$(grep -Rl "<cds.services.version>" app/single-tenant/central-space/demoapp | grep pom.xml || true)
165141
if [ -z "$FILES" ]; then
166142
echo "No pom.xml files with <cds.services.version> found" >&2; exit 1;
167143
fi
@@ -223,7 +199,7 @@ jobs:
223199
echo "Current Branch: 📂"
224200
git branch
225201
pwd
226-
cd /home/runner/work/sdm/sdm/cap-notebook/demoapp
202+
cd /home/runner/work/sdm/sdm/app/single-tenant/central-space/demoapp
227203
228204
cd app
229205
echo "🔄 Removing node_modules for fresh install..."

‎.github/workflows/multiTenancyDeployLocal.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,13 @@ jobs:
5757
npm install -g mbt
5858
echo "✅ MBT installation complete!"
5959
60-
- name: Clone the cloud-cap-samples-java repo 🌐
61-
run: |
62-
echo "🔄 Cloning repository..."
63-
git clone --depth 1 --branch local_mtTests https://github.com/vibhutikumar07/cloud-cap-samples-java.git
64-
echo "✅ Repository cloned!"
65-
6660
- name: Override cds.services.version (runtime only)
6761
if: ${{ github.event.inputs.cds_services_version != '' }}
6862
env:
6963
TARGET_CDS_SERVICES_VERSION: ${{ github.event.inputs.cds_services_version }}
7064
run: |
7165
echo "Override requested: cds.services.version -> ${TARGET_CDS_SERVICES_VERSION}"
72-
FILES=$(grep -Rl "<cds.services.version>" . | grep pom.xml || true)
66+
FILES=$(grep -Rl "<cds.services.version>" app/multi-tenant/personal-space/cloud-cap-samples-java | grep pom.xml || true)
7367
if [ -z "$FILES" ]; then
7468
echo "No pom.xml files with <cds.services.version> found" >&2; exit 1;
7569
fi
@@ -82,22 +76,28 @@ jobs:
8276
shell: bash
8377

8478
- name: Change directory to cloud-cap-samples-java 📂
85-
working-directory: cloud-cap-samples-java
79+
working-directory: app/multi-tenant/personal-space/cloud-cap-samples-java
8680
run: |
8781
pwd
8882
echo "✔️ Directory changed!"
8983
84+
- name: Set REPOSITORY_ID 🔍
85+
id: set_repository_id
86+
run: |
87+
echo "repository_id=${{ secrets.REPOSITORY_ID }}" >> $GITHUB_OUTPUT
88+
9089
- name: Run mbt build 🔨
91-
working-directory: cloud-cap-samples-java
90+
working-directory: app/multi-tenant/personal-space/cloud-cap-samples-java
9291
run: |
9392
echo "🚀 Running MBT build..."
9493
echo "java version:"
9594
java --version
95+
sed -i 's|__REPOSITORY_ID__|${{ steps.set_repository_id.outputs.repository_id }}|g' mta.yaml
9696
mbt build
9797
echo "✅ MBT build completed!"
9898
9999
- name: Deploy to Cloud Foundry ☁️
100-
working-directory: cloud-cap-samples-java
100+
working-directory: app/multi-tenant/personal-space/cloud-cap-samples-java
101101
run: |
102102
echo "🚀 Deploying to -s ${{ steps.determine_space.outputs.space }}..."
103103
echo "🔧 Installing Cloud Foundry CLI and plugins..."

‎.github/workflows/multiTenant_deploy_and_Integration_test.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,29 +51,29 @@ jobs:
5151
npm install -g mbt
5252
echo "✅ MBT installation complete!"
5353
54-
- name: Clone the cloud-cap-samples-java repo 🌐
55-
run: |
56-
echo "🔄 Cloning repository..."
57-
git clone --depth 1 --branch mtTests https://github.com/vibhutikumar07/cloud-cap-samples-java.git
58-
echo "✅ Repository cloned!"
59-
6054
- name: Change directory to cloud-cap-samples-java 📂
61-
working-directory: cloud-cap-samples-java
55+
working-directory: app/multi-tenant/central-space/cloud-cap-samples-java
6256
run: |
6357
pwd
6458
echo "✔️ Directory changed!"
6559
60+
- name: Set REPOSITORY_ID 🔍
61+
id: set_repository_id
62+
run: |
63+
echo "repository_id=${{ secrets.REPOSITORY_ID }}" >> $GITHUB_OUTPUT
64+
6665
- name: Run mbt build 🔨
67-
working-directory: cloud-cap-samples-java
66+
working-directory: app/multi-tenant/central-space/cloud-cap-samples-java
6867
run: |
6968
echo "🚀 Running MBT build..."
7069
echo "java version:"
7170
java --version
71+
sed -i 's|__REPOSITORY_ID__|${{ steps.set_repository_id.outputs.repository_id }}|g' mta.yaml
7272
mbt build
7373
echo "✅ MBT build completed!"
7474
7575
- name: Deploy to Cloud Foundry ☁️
76-
working-directory: cloud-cap-samples-java
76+
working-directory: app/multi-tenant/central-space/cloud-cap-samples-java
7777
run: |
7878
echo "🚀 Deploying to ${{ secrets.CF_SPACE }}..."
7979
echo "🔧 Installing Cloud Foundry CLI and plugins..."

‎.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,14 @@ jobs:
4747
npm install -g mbt
4848
echo "✅ MBT installation complete!"
4949
50-
- name: Clone the cloud-cap-samples-java repo 🌐
51-
run: |
52-
echo "🔄 Cloning repository..."
53-
git clone --depth 1 --branch mtTests https://github.com/vibhutikumar07/cloud-cap-samples-java.git
54-
echo "✅ Repository cloned!"
55-
5650
- name: Override cds.services.version (runtime only)
5751
env:
5852
TARGET_CDS_SERVICES_VERSION: 4.3.1
5953
run: |
6054
set -e
6155
echo "=== cds.services.version Override Step ==="
6256
echo "Target version to apply: ${TARGET_CDS_SERVICES_VERSION}"
63-
FILES=$(grep -Rl "<cds.services.version>" . | grep pom.xml || true)
57+
FILES=$(grep -Rl "<cds.services.version>" app/multi-tenant/central-space/cloud-cap-samples-java | grep pom.xml || true)
6458
if [ -z "$FILES" ]; then
6559
echo "No pom.xml files with <cds.services.version> found" >&2; exit 1;
6660
fi
@@ -76,7 +70,7 @@ jobs:
7670
done
7771
7872
echo "\nResolving effective value BEFORE override via mvn help:evaluate ..."
79-
RESOLVED_BEFORE=$(mvn -q -DforceStdout help:evaluate -Dexpression=cds.services.version || true)
73+
RESOLVED_BEFORE=$(mvn -q -DforceStdout help:evaluate -f app/multi-tenant/central-space/cloud-cap-samples-java/pom.xml -Dexpression=cds.services.version || true)
8074
echo "Effective cds.services.version before override: '${RESOLVED_BEFORE}'"
8175
if [ "${RESOLVED_BEFORE}" = "${TARGET_CDS_SERVICES_VERSION}" ]; then
8276
echo "NOTE: Effective value already equals target; files will still be normalized to target string."
@@ -92,7 +86,7 @@ jobs:
9286
grep -R "<cds.services.version>" $FILES || true
9387
9488
echo "\nResolving effective value AFTER override via mvn help:evaluate ..."
95-
RESOLVED_AFTER=$(mvn -q -DforceStdout help:evaluate -Dexpression=cds.services.version || true)
89+
RESOLVED_AFTER=$(mvn -q -DforceStdout help:evaluate -f app/multi-tenant/central-space/cloud-cap-samples-java/pom.xml -Dexpression=cds.services.version || true)
9690
echo "Effective cds.services.version after override: '${RESOLVED_AFTER}'"
9791
if [ "${RESOLVED_AFTER}" != "${TARGET_CDS_SERVICES_VERSION}" ]; then
9892
echo "WARNING: Resolved value does not match target (profiles or parent POM could be overriding it)." >&2
@@ -104,23 +98,29 @@ jobs:
10498

10599

106100
- name: Change directory to cloud-cap-samples-java 📂
107-
working-directory: cloud-cap-samples-java
101+
working-directory: app/multi-tenant/central-space/cloud-cap-samples-java
108102
run: |
109103
pwd
110104
echo "✔️ Directory changed!"
111105
112106
107+
- name: Set REPOSITORY_ID 🔍
108+
id: set_repository_id
109+
run: |
110+
echo "repository_id=${{ secrets.REPOSITORY_ID }}" >> $GITHUB_OUTPUT
111+
113112
- name: Run mbt build 🔨
114-
working-directory: cloud-cap-samples-java
113+
working-directory: app/multi-tenant/central-space/cloud-cap-samples-java
115114
run: |
116115
echo "🚀 Running MBT build..."
117116
echo "java version:"
118117
java --version
118+
sed -i 's|__REPOSITORY_ID__|${{ steps.set_repository_id.outputs.repository_id }}|g' mta.yaml
119119
mbt build
120120
echo "✅ MBT build completed!"
121121
122122
- name: Deploy to Cloud Foundry ☁️
123-
working-directory: cloud-cap-samples-java
123+
working-directory: app/multi-tenant/central-space/cloud-cap-samples-java
124124
run: |
125125
echo "🚀 Deploying to ${{ secrets.CF_SPACE }}..."
126126
echo "🔧 Installing Cloud Foundry CLI and plugins..."

‎.github/workflows/singleTenant_deploy_and_Integration_test.yml‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,6 @@ jobs:
3333
java-version: 21
3434
distribution: 'temurin'
3535

36-
- name: Verify and Checkout Deploy Branch
37-
run: |
38-
git fetch origin
39-
if git rev-parse --verify origin/develop_deploy; then
40-
git checkout develop_deploy
41-
else
42-
echo "Branch 'develop_deploy' not found. Please verify the branch name."
43-
exit 1
44-
fi
45-
4636
- name: Deleting the sdm directory for fresh build
4737
run: |
4838
pwd
@@ -70,20 +60,25 @@ jobs:
7060
# mvn dependency:get -Dartifact=com.sap.cds:sdm-root:LATEST -DrepoUrl=https://maven.pkg.github.com/cap-java/sdm
7161
# mvn dependency:get -Dartifact=com.sap.cds:sdm:LATEST -DrepoUrl=https://maven.pkg.github.com/cap-java/sdm
7262

63+
- name: Set REPOSITORY_ID 🔍
64+
id: set_repository_id
65+
run: |
66+
echo "repository_id=${{ secrets.REPOSITORY_ID }}" >> $GITHUB_OUTPUT
67+
7368
- name: Prepare and Deploy to Cloud Foundry
7469
run: |
7570
echo "Current Branch......"
7671
git branch
7772
pwd
78-
cd /home/runner/work/sdm/sdm/cap-notebook/demoapp
73+
cd /home/runner/work/sdm/sdm/app/single-tenant/central-space/demoapp
7974
# Removing node_modules & package-lock.json
8075
cd app
8176
rm -rf node_modules package-lock.json
8277
8378
npm i
8479
8580
cd ..
86-
81+
8782
# Replace placeholder with actual REPOSITORY_ID value
8883
sed -i 's|__REPOSITORY_ID__|'${{ steps.set_repository_id.outputs.repository_id }}'|g' ./mta.yaml
8984

‎.github/workflows/singleTenant_deploy_and_Integration_test_LatestVersion.yml‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,14 @@ jobs:
3333
java-version: 21
3434
distribution: 'temurin'
3535

36-
- name: Verify and Checkout Deploy Branch
37-
run: |
38-
git fetch origin
39-
if git rev-parse --verify origin/develop_deploy; then
40-
git checkout develop_deploy
41-
else
42-
echo "Branch 'develop_deploy' not found. Please verify the branch name."
43-
exit 1
44-
fi
45-
4636
- name: Override cds.services.version (runtime only)
4737
env:
4838
TARGET_CDS_SERVICES_VERSION: 4.3.1
4939
run: |
5040
set -e
5141
echo "=== cds.services.version Override Step ==="
5242
echo "Target version to apply: ${TARGET_CDS_SERVICES_VERSION}"
53-
FILES=$(grep -Rl "<cds.services.version>" . | grep pom.xml || true)
43+
FILES=$(grep -Rl "<cds.services.version>" app/single-tenant/central-space/demoapp | grep pom.xml || true)
5444
if [ -z "$FILES" ]; then
5545
echo "No pom.xml files with <cds.services.version> found" >&2; exit 1;
5646
fi
@@ -66,7 +56,7 @@ jobs:
6656
done
6757
6858
echo "\nResolving effective value BEFORE override via mvn help:evaluate ..."
69-
RESOLVED_BEFORE=$(mvn -q -DforceStdout help:evaluate -Dexpression=cds.services.version || true)
59+
RESOLVED_BEFORE=$(mvn -q -DforceStdout help:evaluate -f app/single-tenant/central-space/demoapp/pom.xml -Dexpression=cds.services.version || true)
7060
echo "Effective cds.services.version before override: '${RESOLVED_BEFORE}'"
7161
if [ "${RESOLVED_BEFORE}" = "${TARGET_CDS_SERVICES_VERSION}" ]; then
7262
echo "NOTE: Effective value already equals target; files will still be normalized to target string."
@@ -82,7 +72,7 @@ jobs:
8272
grep -R "<cds.services.version>" $FILES || true
8373
8474
echo "\nResolving effective value AFTER override via mvn help:evaluate ..."
85-
RESOLVED_AFTER=$(mvn -q -DforceStdout help:evaluate -Dexpression=cds.services.version || true)
75+
RESOLVED_AFTER=$(mvn -q -DforceStdout help:evaluate -f app/single-tenant/central-space/demoapp/pom.xml -Dexpression=cds.services.version || true)
8676
echo "Effective cds.services.version after override: '${RESOLVED_AFTER}'"
8777
if [ "${RESOLVED_AFTER}" != "${TARGET_CDS_SERVICES_VERSION}" ]; then
8878
echo "WARNING: Resolved value does not match target (profiles or parent POM could be overriding it)." >&2
@@ -121,20 +111,25 @@ jobs:
121111
# mvn dependency:get -Dartifact=com.sap.cds:sdm-root:LATEST -DrepoUrl=https://maven.pkg.github.com/cap-java/sdm
122112
# mvn dependency:get -Dartifact=com.sap.cds:sdm:LATEST -DrepoUrl=https://maven.pkg.github.com/cap-java/sdm
123113

114+
- name: Set REPOSITORY_ID 🔍
115+
id: set_repository_id
116+
run: |
117+
echo "repository_id=${{ secrets.REPOSITORY_ID }}" >> $GITHUB_OUTPUT
118+
124119
- name: Prepare and Deploy to Cloud Foundry
125120
run: |
126121
echo "Current Branch......"
127122
git branch
128123
pwd
129-
cd /home/runner/work/sdm/sdm/cap-notebook/demoapp
124+
cd /home/runner/work/sdm/sdm/app/single-tenant/central-space/demoapp
130125
# Removing node_modules & package-lock.json
131126
cd app
132127
rm -rf node_modules package-lock.json
133128
134129
npm i
135130
136131
cd ..
137-
132+
138133
# Replace placeholder with actual REPOSITORY_ID value
139134
sed -i 's|__REPOSITORY_ID__|'${{ steps.set_repository_id.outputs.repository_id }}'|g' ./mta.yaml
140135

‎.github/workflows/sonarqube.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
-Dsonar.junit.reportPaths=sdm/target/surefire-reports \
5656
-Dsonar.coverage.jacoco.xmlReportPaths=sdm/target/site/jacoco/jacoco.xml \
5757
-Dsonar.inclusions=**/*.java \
58-
-Dsonar.exclusions=**/target/**,**/node_modules/**,sdm/src/main/test/**,cap-notebook/*.capnb,sdm/src/main/java/com/sap/cds/sdm/model/**,sdm/src/main/java/com/sap/cds/sdm/caching/CacheKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/RepoKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/TokenCacheKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/SecondaryTypesKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/SecondaryPropertiesKey.java \
58+
-Dsonar.exclusions=**/target/**,**/node_modules/**,sdm/src/main/test/**,app/**/*.capnb,sdm/src/main/java/com/sap/cds/sdm/model/**,sdm/src/main/java/com/sap/cds/sdm/caching/CacheKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/RepoKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/TokenCacheKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/SecondaryTypesKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/SecondaryPropertiesKey.java \
5959
-Dsonar.java.file.suffixes=.java \
6060
-Dsonar.host.url=${{ secrets.SONAR_HOST_URL }} \
6161
-Dsonar.login=${{ secrets.SONAR_TOKEN }} \
@@ -71,7 +71,7 @@ jobs:
7171
-Dsonar.junit.reportPaths=sdm/target/surefire-reports \
7272
-Dsonar.coverage.jacoco.xmlReportPaths=sdm/target/site/jacoco/jacoco.xml \
7373
-Dsonar.inclusions=**/*.java \
74-
-Dsonar.exclusions=**/target/**,**/node_modules/**,sdm/src/main/test/**,cap-notebook/*.capnb,sdm/src/main/java/com/sap/cds/sdm/model/**,sdm/src/main/java/com/sap/cds/sdm/caching/CacheKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/RepoKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/TokenCacheKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/SecondaryTypesKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/SecondaryPropertiesKey.java \
74+
-Dsonar.exclusions=**/target/**,**/node_modules/**,sdm/src/main/test/**,app/**/*.capnb,sdm/src/main/java/com/sap/cds/sdm/model/**,sdm/src/main/java/com/sap/cds/sdm/caching/CacheKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/RepoKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/TokenCacheKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/SecondaryTypesKey.java,sdm/src/main/java/com/sap/cds/sdm/caching/SecondaryPropertiesKey.java \
7575
-Dsonar.java.file.suffixes=.java \
7676
-Dsonar.host.url=${{ secrets.SONAR_HOST_URL }} \
7777
-Dsonar.login=${{ secrets.SONAR_TOKEN }}

0 commit comments

Comments
 (0)