Skip to content

Commit 95cf34e

Browse files
committed
Merge branch 'develop' into SDMEXT-1542
2 parents c6c4026 + 25edacb commit 95cf34e

46 files changed

Lines changed: 2694 additions & 459 deletions

Some content is hidden

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

.github/workflows/blackduck.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
workflow_dispatch:
1212

1313
permissions:
14+
contents: read # allows workflow to checkout private repository
1415
pull-requests: read # allows SonarQube to decorate PRs with analysis results
1516

1617
jobs:

.github/workflows/build-doctor.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/workflows/cfdeploy.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ on:
2626
default: ''
2727

2828
permissions:
29+
contents: read
2930
pull-requests: read
3031
packages: read # Added permission to read packages
3132

@@ -114,7 +115,7 @@ jobs:
114115
wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo tee /etc/apt/trusted.gpg.d/cloudfoundry.asc
115116
echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
116117
sudo apt update
117-
sudo apt install cf-cli
118+
sudo apt install cf8-cli
118119
119120
cf install-plugin multiapps -f
120121
@@ -249,7 +250,7 @@ jobs:
249250
wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo tee /etc/apt/trusted.gpg.d/cloudfoundry.asc
250251
echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
251252
sudo apt update
252-
sudo apt install cf-cli
253+
sudo apt install cf8-cli
253254
254255
cf install-plugin multiapps -f
255256

.github/workflows/gemini-ask.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/workflows/gemini-pr-review.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/gemini_issues_review.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

.github/workflows/main-build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ jobs:
1313
build:
1414
name: Build
1515
runs-on: ubuntu-latest
16+
permissions:
17+
contents: read
1618
strategy:
1719
matrix:
1820
java-version: [ 17 ]
@@ -31,7 +33,7 @@ jobs:
3133
runs-on: ubuntu-latest
3234
needs: [ build ]
3335
permissions:
34-
contents: read
36+
contents: write
3537
packages: write
3638
steps:
3739
- name: Checkout
@@ -98,5 +100,5 @@ jobs:
98100
run: |
99101
mvn -B -ntp -fae -Dmaven.install.skip=true -Dmaven.test.skip=true -DdeployAtEnd=true -DaltDeploymentRepository=github::default::https://maven.pkg.github.com/cap-java/sdm deploy
100102
env:
101-
GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
103+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
102104
shell: bash

.github/workflows/multiTenancyDeployLocal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo tee /etc/apt/trusted.gpg.d/cloudfoundry.asc
106106
echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
107107
sudo apt update
108-
sudo apt install cf-cli
108+
sudo apt install cf8-cli
109109
110110
cf install-plugin multiapps -f
111111
echo "✅ Cloud Foundry CLI setup complete!"

.github/workflows/multiTenant_deploy_and_Integration_test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
workflow_dispatch:
1010

1111
permissions:
12+
contents: read
1213
pull-requests: read
1314
packages: read # Added permission to read packages
1415

@@ -81,7 +82,7 @@ jobs:
8182
wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo tee /etc/apt/trusted.gpg.d/cloudfoundry.asc
8283
echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
8384
sudo apt update
84-
sudo apt install cf-cli
85+
sudo apt install cf8-cli
8586
8687
cf install-plugin multiapps -f
8788
echo "✅ Cloud Foundry CLI setup complete!"
@@ -317,7 +318,7 @@ jobs:
317318
test-summary:
318319
runs-on: ubuntu-latest
319320
needs: integration-test
320-
if: always()
321+
if: always() && github.event.pull_request.merged == true
321322
steps:
322323
- name: Check test results 📋
323324
run: |

.github/workflows/multiTenant_deploy_and_Integration_test_LatestVersion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo tee /etc/apt/trusted.gpg.d/cloudfoundry.asc
130130
echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
131131
sudo apt update
132-
sudo apt install cf-cli
132+
sudo apt install cf8-cli
133133
134134
cf install-plugin multiapps -f
135135
echo "✅ Cloud Foundry CLI setup complete!"

0 commit comments

Comments
 (0)