Skip to content

Commit 94112b6

Browse files
committed
Merge branch 'main' into feature/pytho_src_layout
2 parents 17017a6 + db32adf commit 94112b6

File tree

3 files changed

+29
-10
lines changed

3 files changed

+29
-10
lines changed

.github/workflows/sdk-pr.yaml

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ env:
1111
JAVA_VERSION: '11'
1212

1313
jobs:
14-
main:
15-
name: Update SDK Repo
14+
main-go:
15+
name: [Go] Update SDK Repo
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Install SSH Key
@@ -31,19 +31,39 @@ jobs:
3131
uses: ./.github/actions/build
3232
with:
3333
go-version: ${{ env.GO_VERSION }}
34-
- name: Generate Go SDK
34+
- name: Generate SDK
3535
uses: ./.github/actions/generate-sdk/go
36-
- name: Push Go SDK
36+
- name: Push SDK
3737
env:
3838
GH_REPO: 'stackitcloud/stackit-sdk-go'
3939
GH_TOKEN: ${{ secrets.SDK_PR_TOKEN }}
4040
run: |
41-
scripts/sdk-create-pr.sh "generator-bot-${{ github.run_id }}" "Generated from GitHub run [${{ github.run_id }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
42-
- name: Generate Python SDK
41+
scripts/sdk-create-pr.sh "generator-bot-${{ github.run_id }}" "Generated from GitHub run [${{ github.run_id }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
42+
main-python:
43+
name: [Python] Update SDK Repo
44+
runs-on: ubuntu-latest
45+
steps:
46+
- name: Install SSH Key
47+
uses: shimataro/ssh-key-action@v2
48+
with:
49+
key: ${{ secrets.SSH_PRIVATE_KEY }}
50+
known_hosts: ${{ vars.SSH_KNOWN_HOSTS }}
51+
- name: Install Java
52+
uses: actions/setup-java@v4
53+
with:
54+
distribution: 'temurin'
55+
java-version: ${{ env.JAVA_VERSION }}
56+
- name: Checkout
57+
uses: actions/checkout@v4
58+
- name: Build
59+
uses: ./.github/actions/build
60+
with:
61+
go-version: ${{ env.GO_VERSION }}
62+
- name: Generate SDK
4363
uses: ./.github/actions/generate-sdk/python
44-
- name: Push Python SDK
64+
- name: Push SDK
4565
env:
4666
GH_REPO: 'stackitcloud/stackit-sdk-python'
4767
GH_TOKEN: ${{ secrets.SDK_PR_TOKEN }}
4868
run: |
49-
scripts/sdk-create-pr.sh "generator-bot-${{ github.run_id }}" "Generated from GitHub run [${{ github.run_id }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})" "[email protected]:stackitcloud/stackit-sdk-python.git" "python"
69+
scripts/sdk-create-pr.sh "generator-bot-${{ github.run_id }}" "Generated from GitHub run [${{ github.run_id }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})" "[email protected]:stackitcloud/stackit-sdk-python.git" "python"

scripts/generate-sdk/generate-sdk.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ go)
5151
GENERATOR_VERSION="v6.6.0" # There are issues with GO SDK generation in version v7
5252
;;
5353
python)
54-
GENERATOR_VERSION="v7.7.0"
54+
GENERATOR_VERSION="v7.9.0"
5555
;;
5656
*)
5757
echo "SDK language not supported."

templates/python/pyproject.mustache

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ authors = [
77
description = "{{{appName}}}"
88
#readme = "README.md"
99
#license = "{{{licenseInfo}}}{{^licenseInfo}}NoLicense{{/licenseInfo}}"
10-
#requires-python = ">=3.8"
1110
classifiers = [
1211
"Programming Language :: Python :: 3",
1312
"License :: OSI Approved :: Apache Software License",

0 commit comments

Comments
 (0)