Skip to content

Commit 6d4eadd

Browse files
committed
Merge remote-tracking branch 'origin/main' into core/test-client-response-handler
# Conflicts: # core/pom.xml
2 parents acd5627 + 4aecbbf commit 6d4eadd

File tree

278 files changed

+5276
-4327
lines changed

Some content is hidden

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

278 files changed

+5276
-4327
lines changed

.github/workflows/continuous-integration.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches: [ "*" ]
55
push:
66
branches: [ "main" ]
7+
workflow_dispatch: # triggered by the prepare-release workflow
78

89
env:
910
MVN_MULTI_THREADED_ARGS: --batch-mode --no-transfer-progress --fail-at-end --show-version --threads 1C
Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,37 +20,26 @@ jobs:
2020
prerequisites:
2121
name: "Prerequisites"
2222
outputs:
23-
release-version: ${{ steps.determine-branch-names.outputs.RELEASE_VERSION }}
24-
release-tag: ${{ steps.determine-branch-names.outputs.RELEASE_TAG }}
2523
code-branch: ${{ steps.determine-branch-names.outputs.CODE_BRANCH_NAME }}
24+
release-tag: ${{ steps.determine-branch-names.outputs.RELEASE_TAG }}
2625
release-commit: ${{ steps.determine-branch-names.outputs.RELEASE_COMMIT }}
27-
permissions:
28-
pull-requests: read
29-
contents: read
26+
permissions: write-all # contents and push are needed to see the draft release
3027
runs-on: ubuntu-latest
3128
steps:
3229
- name: "Determine Branch Names"
3330
id: determine-branch-names
3431
run: |
35-
if [[ "${{ github.event_name }}" == "pull_request_review" ]]; then
36-
echo "[DEBUG] Taking branch name from pull request event"
37-
BRANCH_NAME=${{ github.event.pull_request.head.ref }}
38-
elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
39-
echo "[DEBUG] Taking branch name from workflow dispatch event"
40-
BRANCH_NAME=$(gh pr view ${{ github.event.inputs.release_pr_number }} --repo "${{ github.repository }}" --json headRefName | jq -r '.headRefName')
41-
else
42-
echo "Cannot determine branch name from event '${{ github.event_name }}'"
43-
exit 1
44-
fi
32+
CODE_BRANCH_NAME=$(gh pr view ${{github.event.inputs.release_pr_number}} --repo ${{github.repository}} --json headRefName --jq '.headRefName')
33+
RELEASE_VERSION=$(echo $CODE_BRANCH_NAME | cut -d '-' -f2)
34+
RELEASE_TAG=rel/$RELEASE_VERSION
35+
RELEASE_COMMIT=$(gh release view $RELEASE_TAG --repo ${{github.repository}} --json targetCommitish --jq '.targetCommitish')
4536
46-
RELEASE_VERSION=$(echo "$BRANCH_NAME" | cut -d '-' -f2)
47-
37+
echo "CODE_BRANCH_NAME=$CODE_BRANCH_NAME" >> $GITHUB_OUTPUT
4838
echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_OUTPUT
49-
echo "RELEASE_TAG=rel/$RELEASE_VERSION" >> $GITHUB_OUTPUT
50-
echo "CODE_BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
51-
echo "RELEASE_COMMIT=$(gh release view "$RELEASE_TAG" --repo "${{ github.repository }}" --json targetCommitish | jq -r '.targetCommitish')" >> $GITHUB_OUTPUT
39+
echo "RELEASE_TAG=$RELEASE_TAG" >> $GITHUB_OUTPUT
40+
echo "RELEASE_COMMIT=$RELEASE_COMMIT" >> $GITHUB_OUTPUT
5241
53-
echo "[DEBUG] Current GITHUB_OUTPUT: '$(cat $GITHUB_OUTPUT)'"
42+
echo -e "[DEBUG] Current GITHUB_OUTPUT:\n$(cat $GITHUB_OUTPUT)"
5443
env:
5544
GH_TOKEN: ${{ github.token }}
5645

.github/workflows/prepare-release.yaml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,18 +140,6 @@ jobs:
140140
git config --global user.email "[email protected]"
141141
git config --global user.name "SAP Cloud SDK Bot"
142142
143-
- name: "Set New Version and Reset Release Notes"
144-
run: |
145-
python .pipeline/scripts/set-release-versions.py --version ${{ needs.bump-version.outputs.new-version }}
146-
git add .
147-
git commit -m "Update to version ${{ needs.bump-version.outputs.new-version }}"
148-
149-
# Reset release notes for next version
150-
cp .pipeline/scripts/release_notes_template.md docs/release-notes/release_notes.md
151-
git add docs/release-notes/release_notes.md
152-
git commit -m "Reset release notes"
153-
git push
154-
155143
- name: "Create Code PR"
156144
run: |
157145
COMMIT_URL=${{ github.event.repository.html_url }}/commit/${{ needs.bump-version.outputs.release-commit }}
@@ -166,6 +154,24 @@ jobs:
166154
env:
167155
GH_TOKEN: ${{ secrets.BOT_SDK_JS_FOR_DOCS_REPO_PR }}
168156

157+
- name: "Run Continuous Integration" # It should trigger on push but sometimes doesn't
158+
run: |
159+
gh workflow run continuous-integration.yaml --ref ${{ needs.bump-version.outputs.release-branch }}
160+
env:
161+
GH_TOKEN: ${{ secrets.BOT_SDK_JS_FOR_DOCS_REPO_PR }}
162+
163+
- name: "Set New Version and Reset Release Notes"
164+
run: |
165+
python .pipeline/scripts/set-release-versions.py --version ${{ needs.bump-version.outputs.new-version }}
166+
git add .
167+
git commit -m "Update to version ${{ needs.bump-version.outputs.new-version }}"
168+
169+
# Reset release notes for next version
170+
cp .pipeline/scripts/release_notes_template.md docs/release-notes/release_notes.md
171+
git add docs/release-notes/release_notes.md
172+
git commit -m "Reset release notes"
173+
git push
174+
169175
handle-failure:
170176
runs-on: ubuntu-latest
171177
needs: [ bump-version, create-release, create-code-pr ]

core/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.sap.ai.sdk</groupId>
66
<artifactId>sdk-parent</artifactId>
7-
<version>1.1.0-SNAPSHOT</version>
7+
<version>1.2.0-SNAPSHOT</version>
88
</parent>
99
<artifactId>core</artifactId>
1010
<name>AI Core client</name>
@@ -30,12 +30,12 @@
3030
</developers>
3131
<properties>
3232
<project.rootdir>${project.basedir}/../</project.rootdir>
33-
<coverage.complexity>60%</coverage.complexity>
34-
<coverage.line>83%</coverage.line>
35-
<coverage.instruction>68%</coverage.instruction>
36-
<coverage.branch>52%</coverage.branch>
37-
<coverage.method>73%</coverage.method>
38-
<coverage.class>87%</coverage.class>
33+
<coverage.complexity>52%</coverage.complexity>
34+
<coverage.line>64%</coverage.line>
35+
<coverage.instruction>62%</coverage.instruction>
36+
<coverage.branch>47%</coverage.branch>
37+
<coverage.method>65%</coverage.method>
38+
<coverage.class>80%</coverage.class>
3939
</properties>
4040

4141
<dependencies>

core/src/main/java/com/sap/ai/sdk/core/client/ApplicationApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.springframework.web.util.UriComponentsBuilder;
2727

2828
/**
29-
* AI Core in version 2.36.0.
29+
* AI Core in version 2.37.0.
3030
*
3131
* <p>Provides tools to manage your scenarios and workflows in SAP AI Core. Execute pipelines as a
3232
* batch job, for example to pre-process or train your models, or perform batch inference. Serve

core/src/main/java/com/sap/ai/sdk/core/client/ArtifactApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.springframework.web.util.UriComponentsBuilder;
2424

2525
/**
26-
* AI Core in version 2.36.0.
26+
* AI Core in version 2.37.0.
2727
*
2828
* <p>Provides tools to manage your scenarios and workflows in SAP AI Core. Execute pipelines as a
2929
* batch job, for example to pre-process or train your models, or perform batch inference. Serve

core/src/main/java/com/sap/ai/sdk/core/client/ConfigurationApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.springframework.web.util.UriComponentsBuilder;
2424

2525
/**
26-
* AI Core in version 2.36.0.
26+
* AI Core in version 2.37.0.
2727
*
2828
* <p>Provides tools to manage your scenarios and workflows in SAP AI Core. Execute pipelines as a
2929
* batch job, for example to pre-process or train your models, or perform batch inference. Serve

core/src/main/java/com/sap/ai/sdk/core/client/DeploymentApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.web.util.UriComponentsBuilder;
3131

3232
/**
33-
* AI Core in version 2.36.0.
33+
* AI Core in version 2.37.0.
3434
*
3535
* <p>Provides tools to manage your scenarios and workflows in SAP AI Core. Execute pipelines as a
3636
* batch job, for example to pre-process or train your models, or perform batch inference. Serve

core/src/main/java/com/sap/ai/sdk/core/client/DockerRegistrySecretApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.springframework.web.util.UriComponentsBuilder;
2525

2626
/**
27-
* AI Core in version 2.36.0.
27+
* AI Core in version 2.37.0.
2828
*
2929
* <p>Provides tools to manage your scenarios and workflows in SAP AI Core. Execute pipelines as a
3030
* batch job, for example to pre-process or train your models, or perform batch inference. Serve

core/src/main/java/com/sap/ai/sdk/core/client/ExecutableApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.springframework.web.util.UriComponentsBuilder;
2020

2121
/**
22-
* AI Core in version 2.36.0.
22+
* AI Core in version 2.37.0.
2323
*
2424
* <p>Provides tools to manage your scenarios and workflows in SAP AI Core. Execute pipelines as a
2525
* batch job, for example to pre-process or train your models, or perform batch inference. Serve

0 commit comments

Comments
 (0)