From 3d1900e9f2c6d8d53a6e92a16708ac1ffb6c8f20 Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Fri, 20 Dec 2024 14:01:22 +0100 Subject: [PATCH 01/12] fix --- .github/actions/build/python/action.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/actions/build/python/action.yaml b/.github/actions/build/python/action.yaml index a6e9120..a52bdc5 100644 --- a/.github/actions/build/python/action.yaml +++ b/.github/actions/build/python/action.yaml @@ -5,4 +5,7 @@ runs: steps: - name: Install project tools and dependencies shell: bash - run: make project-tools LANGUAGE=python + run: | + pip install poetry + poetry config virtualenvs.create false + make project-tools LANGUAGE=python From 97f29cd8dfc667b85cff6c62ffca0da843275365 Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Fri, 20 Dec 2024 14:22:53 +0100 Subject: [PATCH 02/12] fixit --- .github/workflows/ci.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2d2c2d5..0b57a5a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -75,7 +75,10 @@ jobs: - name: Install core run: | pip install poetry - poetry config virtualenvs.create false + poetry config virtualenvs.create false + python -m venv .venv + . .venv/bin/activate + echo PATH=$PATH >> $GITHUB_ENV git clone https://github.com/stackitcloud/stackit-sdk-python-core.git core cd core;make install; - name: Install sdk From 2b2ac4fe74cd43ec6210fa429688fb222fe253f0 Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Fri, 20 Dec 2024 14:28:17 +0100 Subject: [PATCH 03/12] wip --- .github/workflows/ci.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0b57a5a..6a7e87a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -78,15 +78,20 @@ jobs: poetry config virtualenvs.create false python -m venv .venv . .venv/bin/activate - echo PATH=$PATH >> $GITHUB_ENV git clone https://github.com/stackitcloud/stackit-sdk-python-core.git core cd core;make install; - name: Install sdk working-directory: ./sdk-repo-updated - run: make install-dev + run: | + . .venv/bin/activate + make install-dev - name: Lint working-directory: ./sdk-repo-updated - run: make lint + run: | + . .venv/bin/activate + make lint - name: Test working-directory: ./sdk-repo-updated - run: make test + run: | + . .venv/bin/activate + make test From bce0c1b59e331c85fbf8229122b72cd7a4a4e869 Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Fri, 20 Dec 2024 14:31:47 +0100 Subject: [PATCH 04/12] wip --- .github/workflows/ci.yaml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6a7e87a..822f72c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -71,18 +71,13 @@ jobs: - name: Install Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: - python-version: ${{ matrix.python-version }} - - name: Install core - run: | - pip install poetry - poetry config virtualenvs.create false - python -m venv .venv - . .venv/bin/activate - git clone https://github.com/stackitcloud/stackit-sdk-python-core.git core - cd core;make install; + python-version: ${{ matrix.python-version }} - name: Install sdk working-directory: ./sdk-repo-updated run: | + pip install poetry + poetry config virtualenvs.create false + python -m venv .venv . .venv/bin/activate make install-dev - name: Lint From 2a92f1ef4f48080f209f9f2436ff8c14a496716f Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Fri, 20 Dec 2024 14:40:51 +0100 Subject: [PATCH 05/12] try something --- .github/workflows/ci.yaml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 822f72c..22d60a0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -76,17 +76,11 @@ jobs: working-directory: ./sdk-repo-updated run: | pip install poetry - poetry config virtualenvs.create false - python -m venv .venv - . .venv/bin/activate + poetry config virtualenvs.create false make install-dev - name: Lint working-directory: ./sdk-repo-updated - run: | - . .venv/bin/activate - make lint + run: make lint - name: Test working-directory: ./sdk-repo-updated - run: | - . .venv/bin/activate - make test + run: make test From 5f2e7945f8ec71a7ae3adb952ff757a75d7e81db Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Fri, 20 Dec 2024 14:44:59 +0100 Subject: [PATCH 06/12] Revert "try something" This reverts commit 2a92f1ef4f48080f209f9f2436ff8c14a496716f. --- .github/workflows/ci.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 22d60a0..822f72c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -76,11 +76,17 @@ jobs: working-directory: ./sdk-repo-updated run: | pip install poetry - poetry config virtualenvs.create false + poetry config virtualenvs.create false + python -m venv .venv + . .venv/bin/activate make install-dev - name: Lint working-directory: ./sdk-repo-updated - run: make lint + run: | + . .venv/bin/activate + make lint - name: Test working-directory: ./sdk-repo-updated - run: make test + run: | + . .venv/bin/activate + make test From 50ed65e29e2f459fbfb0a66099e7469d2db52e61 Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Fri, 20 Dec 2024 14:56:28 +0100 Subject: [PATCH 07/12] try something --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 822f72c..6cdf8d5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -77,8 +77,9 @@ jobs: run: | pip install poetry poetry config virtualenvs.create false - python -m venv .venv + python -m venv .venv . .venv/bin/activate + python -m pip install --upgrade pip make install-dev - name: Lint working-directory: ./sdk-repo-updated From 99be288316815bf9ba603c7d3873bf4368a2961c Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Fri, 20 Dec 2024 15:11:27 +0100 Subject: [PATCH 08/12] fix other pipeline too --- .github/workflows/sdk-pr.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/sdk-pr.yaml b/.github/workflows/sdk-pr.yaml index 5e4a225..3669bbc 100644 --- a/.github/workflows/sdk-pr.yaml +++ b/.github/workflows/sdk-pr.yaml @@ -64,4 +64,9 @@ jobs: GH_REPO: "stackitcloud/stackit-sdk-python" GH_TOKEN: ${{ secrets.SDK_PR_TOKEN }} run: | + pip install poetry + poetry config virtualenvs.create false + python -m venv .venv + . .venv/bin/activate + python -m pip install --upgrade pip 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 }})" "git@github.com:stackitcloud/stackit-sdk-python.git" "python" From 85f90ce0cf979be8b889d30242134e8f09ecda44 Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Fri, 20 Dec 2024 15:12:26 +0100 Subject: [PATCH 09/12] fixit --- .github/actions/build/python/action.yaml | 5 +++-- .github/workflows/sdk-pr.yaml | 7 +------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/actions/build/python/action.yaml b/.github/actions/build/python/action.yaml index a52bdc5..f3d74e2 100644 --- a/.github/actions/build/python/action.yaml +++ b/.github/actions/build/python/action.yaml @@ -6,6 +6,7 @@ runs: - name: Install project tools and dependencies shell: bash run: | - pip install poetry - poetry config virtualenvs.create false + python -m venv .venv + . .venv/bin/activate + python -m pip install --upgrade pip make project-tools LANGUAGE=python diff --git a/.github/workflows/sdk-pr.yaml b/.github/workflows/sdk-pr.yaml index 3669bbc..9f31120 100644 --- a/.github/workflows/sdk-pr.yaml +++ b/.github/workflows/sdk-pr.yaml @@ -63,10 +63,5 @@ jobs: env: GH_REPO: "stackitcloud/stackit-sdk-python" GH_TOKEN: ${{ secrets.SDK_PR_TOKEN }} - run: | - pip install poetry - poetry config virtualenvs.create false - python -m venv .venv - . .venv/bin/activate - python -m pip install --upgrade pip + run: | 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 }})" "git@github.com:stackitcloud/stackit-sdk-python.git" "python" From 12f31c6346e1c30d5fa8a0ced1b88facdd043dca Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Fri, 20 Dec 2024 15:25:12 +0100 Subject: [PATCH 10/12] fix --- .github/workflows/sdk-pr.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/sdk-pr.yaml b/.github/workflows/sdk-pr.yaml index 9f31120..5daa8dc 100644 --- a/.github/workflows/sdk-pr.yaml +++ b/.github/workflows/sdk-pr.yaml @@ -64,4 +64,7 @@ jobs: GH_REPO: "stackitcloud/stackit-sdk-python" GH_TOKEN: ${{ secrets.SDK_PR_TOKEN }} run: | + python -m venv .venv + . .venv/bin/activate + python -m pip install --upgrade pip 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 }})" "git@github.com:stackitcloud/stackit-sdk-python.git" "python" From 31c12d42c69622abf02d06e6adf37a12c189e224 Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Fri, 20 Dec 2024 15:25:38 +0100 Subject: [PATCH 11/12] fix --- .github/workflows/sdk-pr.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sdk-pr.yaml b/.github/workflows/sdk-pr.yaml index 5daa8dc..09df3cc 100644 --- a/.github/workflows/sdk-pr.yaml +++ b/.github/workflows/sdk-pr.yaml @@ -63,7 +63,8 @@ jobs: env: GH_REPO: "stackitcloud/stackit-sdk-python" GH_TOKEN: ${{ secrets.SDK_PR_TOKEN }} - run: | + run: | + set -e python -m venv .venv . .venv/bin/activate python -m pip install --upgrade pip From f061b3908412de933e76ce4168ceb2e67a24ec06 Mon Sep 17 00:00:00 2001 From: Melvin Klein Date: Fri, 20 Dec 2024 15:36:27 +0100 Subject: [PATCH 12/12] fix --- .github/workflows/sdk-pr.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sdk-pr.yaml b/.github/workflows/sdk-pr.yaml index 09df3cc..261b0bf 100644 --- a/.github/workflows/sdk-pr.yaml +++ b/.github/workflows/sdk-pr.yaml @@ -68,4 +68,6 @@ jobs: python -m venv .venv . .venv/bin/activate python -m pip install --upgrade pip + pip install poetry + poetry config virtualenvs.create false 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 }})" "git@github.com:stackitcloud/stackit-sdk-python.git" "python"