Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 2 additions & 28 deletions .github/workflows/blackduck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,40 +42,14 @@ jobs:
mvn clean install -f app/single-tenant/central-space/demoapp/pom.xml -DskipTests
mvn clean install -f app/multi-tenant/central-space/cloud-cap-samples-java/pom.xml -DskipTests

- name: Setup npm registries and install SAP packages
env:
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
- name: Install npm dependencies
run: |
set +x
echo "::add-mask::$NPM_AUTH_TOKEN"
echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
Comment thread
akgarg06 marked this conversation as resolved.
echo "::add-mask::$SAP_CDS_DK_TARBALL"

MTXS="$SAP_CDS_MTXS_TARBALL"
DK="$SAP_CDS_DK_TARBALL"
TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')

for dir in \
"app/multi-tenant/central-space/cloud-cap-samples-java" \
"app/multi-tenant/central-space/cloud-cap-samples-java/mtx/sidecar" \
"app/multi-tenant/personal-space/cloud-cap-samples-java" \
"app/multi-tenant/personal-space/cloud-cap-samples-java/mtx/sidecar"; do

printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
"$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"

tmp=$(mktemp)
jq --arg mtxs "$MTXS" --arg dk "$DK" '
(if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
| (if .dependencies["@sap/cds-dk"] then .dependencies["@sap/cds-dk"] = $dk else . end)
| .overrides["@sap/cds-mtxs"] = $mtxs
' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"

npm install --prefix "$dir"

git checkout "$dir/package.json"
npm install --prefix "$dir" --legacy-peer-deps
done

# - name: Download Synopsys Detect Script
Expand Down
60 changes: 0 additions & 60 deletions .github/workflows/cfdeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,36 +76,6 @@ jobs:
fi
fi

- name: Setup npm registry and pin SAP tarballs 📦
env:
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
run: |
set +x
echo "::add-mask::$NPM_AUTH_TOKEN"
echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
echo "::add-mask::$SAP_CDS_DK_TARBALL"

MTXS="$SAP_CDS_MTXS_TARBALL"
DK="$SAP_CDS_DK_TARBALL"
TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')

for dir in \
"app/single-tenant/personal-space/demoapp" \
"app/single-tenant/personal-space/demoapp/db" \
"app/single-tenant/personal-space/demoapp/app"; do

printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
"$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"

tmp=$(mktemp)
jq --arg mtxs "$MTXS" --arg dk "$DK" '
(if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
| (if .dependencies["@sap/cds-dk"] then .dependencies["@sap/cds-dk"] = $dk else . end)
' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
done

- name: Prepare and Deploy to Cloud Foundry ☁️
run: |
set +x
Expand Down Expand Up @@ -244,36 +214,6 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Setup npm registry and pin SAP tarballs 📦
env:
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
run: |
set +x
echo "::add-mask::$NPM_AUTH_TOKEN"
echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
echo "::add-mask::$SAP_CDS_DK_TARBALL"

MTXS="$SAP_CDS_MTXS_TARBALL"
DK="$SAP_CDS_DK_TARBALL"
TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')

for dir in \
"app/single-tenant/central-space/demoapp" \
"app/single-tenant/central-space/demoapp/db" \
"app/single-tenant/central-space/demoapp/app"; do

printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
"$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"

tmp=$(mktemp)
jq --arg mtxs "$MTXS" --arg dk "$DK" '
(if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
| (if .dependencies["@sap/cds-dk"] then .dependencies["@sap/cds-dk"] = $dk else . end)
' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
done

- name: Prepare and Deploy to Cloud Foundry ☁️
run: |
set +x
Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/multiTenancyDeployLocal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,35 +52,6 @@ jobs:
with:
node-version: '20' # Ensure to use at least version 18

- name: Setup npm registry and pin SAP tarballs 📦
env:
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
run: |
set +x
echo "::add-mask::$NPM_AUTH_TOKEN"
echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
echo "::add-mask::$SAP_CDS_DK_TARBALL"

MTXS="$SAP_CDS_MTXS_TARBALL"
DK="$SAP_CDS_DK_TARBALL"
TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')

for dir in \
"app/multi-tenant/personal-space/cloud-cap-samples-java" \
"app/multi-tenant/personal-space/cloud-cap-samples-java/mtx/sidecar"; do

printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
"$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"

tmp=$(mktemp)
jq --arg mtxs "$MTXS" --arg dk "$DK" '
(if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
| (if .dependencies["@sap/cds-dk"] then .dependencies["@sap/cds-dk"] = $dk else . end)
' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
done

- name: Install MBT ⚙️
run: |
echo "🔧 Installing MBT..."
Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/multiTenant_deploy_and_Integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,35 +43,6 @@ jobs:
with:
node-version: '20' # Ensure to use at least version 18

- name: Setup npm registry and pin SAP tarballs 📦
env:
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
run: |
set +x
echo "::add-mask::$NPM_AUTH_TOKEN"
echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
echo "::add-mask::$SAP_CDS_DK_TARBALL"

MTXS="$SAP_CDS_MTXS_TARBALL"
DK="$SAP_CDS_DK_TARBALL"
TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')

for dir in \
"app/multi-tenant/central-space/cloud-cap-samples-java" \
"app/multi-tenant/central-space/cloud-cap-samples-java/mtx/sidecar"; do

printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
"$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"

tmp=$(mktemp)
jq --arg mtxs "$MTXS" --arg dk "$DK" '
(if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
| (if .dependencies["@sap/cds-dk"] then .dependencies["@sap/cds-dk"] = $dk else . end)
' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
done

- name: Install MBT ⚙️
run: |
echo "🔧 Installing MBT..."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,35 +43,6 @@ jobs:
with:
node-version: '20' # Ensure to use at least version 18

- name: Setup npm registry and pin SAP tarballs 📦
env:
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
SAP_CDS_MTXS_TARBALL: ${{ secrets.SAP_CDS_MTXS_TARBALL }}
SAP_CDS_DK_TARBALL: ${{ secrets.SAP_CDS_DK_TARBALL }}
run: |
set +x
echo "::add-mask::$NPM_AUTH_TOKEN"
echo "::add-mask::$SAP_CDS_MTXS_TARBALL"
echo "::add-mask::$SAP_CDS_DK_TARBALL"

MTXS="$SAP_CDS_MTXS_TARBALL"
DK="$SAP_CDS_DK_TARBALL"
TARBALL_HOST=$(printf '%s' "$MTXS" | sed -E 's#^https?://([^/]+)/.*#\1#')

for dir in \
"app/multi-tenant/central-space/cloud-cap-samples-java" \
"app/multi-tenant/central-space/cloud-cap-samples-java/mtx/sidecar"; do

printf '@sap:registry=https://registry.npmjs.org/\n//%s/:_authToken=%s\nlegacy-peer-deps=true\n' \
"$TARBALL_HOST" "$NPM_AUTH_TOKEN" > "$dir/.npmrc"

tmp=$(mktemp)
jq --arg mtxs "$MTXS" --arg dk "$DK" '
(if .dependencies["@sap/cds-mtxs"] then .dependencies["@sap/cds-mtxs"] = $mtxs else . end)
| (if .dependencies["@sap/cds-dk"] then .dependencies["@sap/cds-dk"] = $dk else . end)
' "$dir/package.json" > "$tmp" && mv "$tmp" "$dir/package.json"
done

- name: Install MBT ⚙️
run: |
echo "🔧 Installing MBT..."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<cloud.sdk.version>5.12.0</cloud.sdk.version>
<xsuaa.version>3.5.0</xsuaa.version>
<cf-java-logging-support.version>3.8.3</cf-java-logging-support.version>
<cds.install-cdsdk.version>9.8.0</cds.install-cdsdk.version>
<cds.install-cdsdk.version>^9</cds.install-cdsdk.version>
</properties>

<modules>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<cloud.sdk.version>5.12.0</cloud.sdk.version>
<xsuaa.version>3.5.0</xsuaa.version>
<cf-java-logging-support.version>3.8.3</cf-java-logging-support.version>
<cds.install-cdsdk.version>9.3.1</cds.install-cdsdk.version>
<cds.install-cdsdk.version>^9</cds.install-cdsdk.version>
</properties>

<modules>
Expand Down
2 changes: 1 addition & 1 deletion app/single-tenant/central-space/demoapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<jdk.version>21</jdk.version>
<cds.services.version>4.1.1</cds.services.version>
<spring.boot.version>3.3.1</spring.boot.version>
<cds.install-cdsdk.version>8.0.2</cds.install-cdsdk.version>
<cds.install-cdsdk.version>^9</cds.install-cdsdk.version>

<cds.install-node.downloadUrl>https://nodejs.org/dist/</cds.install-node.downloadUrl>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion app/single-tenant/personal-space/demoapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<jdk.version>21</jdk.version>
<cds.services.version>4.1.1</cds.services.version>
<spring.boot.version>3.3.1</spring.boot.version>
<cds.install-cdsdk.version>8.0.2</cds.install-cdsdk.version>
<cds.install-cdsdk.version>^9</cds.install-cdsdk.version>

<cds.install-node.downloadUrl>https://nodejs.org/dist/</cds.install-node.downloadUrl>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
Loading