Skip to content

Commit f8ba76e

Browse files
committed
ci: Centralised Poetry install
1 parent 79b7cbf commit f8ba76e

3 files changed

Lines changed: 7 additions & 12 deletions

File tree

.github/workflows/api-pull-request.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,14 @@ jobs:
4444
- name: Cloning repo
4545
uses: actions/checkout@v4
4646

47-
- name: Install poetry
48-
run: pipx install poetry
49-
5047
- uses: actions/setup-python@v5
5148
with:
5249
python-version: ${{ matrix.python-version }}
53-
cache: 'poetry'
50+
cache: poetry
5451

5552
- name: Install Dependencies
5653
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
57-
run: make install-packages
54+
run: make install
5855

5956
- name: Create analytics database
6057
env:

.github/workflows/api-run-makefile-target.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ defaults:
2727
working-directory: api
2828

2929
jobs:
30-
add-sdk-version:
30+
run-makefile-target:
3131
runs-on: depot-ubuntu-latest
3232

3333
steps:
@@ -36,10 +36,10 @@ jobs:
3636
- uses: actions/setup-python@v5
3737
with:
3838
python-version: 3.11
39-
cache: "poetry"
39+
cache: poetry
4040

4141
- name: Install Dependencies
42-
run: make install-packages
42+
run: make install
4343

4444
- name: Run `make ${{ inputs.target }} opts=${{ inputs.opts }}`
4545
env:

.github/workflows/api-tests-with-private-packages.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,10 @@ jobs:
3030
- name: Cloning repo
3131
uses: actions/checkout@v4
3232

33-
- name: Install poetry
34-
run: pipx install poetry
3533
- uses: actions/setup-python@v5
3634
with:
3735
python-version: '3.12'
38-
cache: 'poetry'
36+
cache: poetry
3937

4038
- name: Install SAML Dependencies
4139
run: sudo apt-get install -y xmlsec1
@@ -46,7 +44,7 @@ jobs:
4644
run: |
4745
echo "https://${{ secrets.GH_PRIVATE_ACCESS_TOKEN }}:@github.com" > ${HOME}/.git-credentials
4846
git config --global credential.helper store
49-
make install-packages opts="--with saml,auth-controller,workflows"
47+
make install opts="--with saml,auth-controller,workflows"
5048
make install-private-modules
5149
make integrate-private-tests
5250
rm -rf ${HOME}/.git-credentials

0 commit comments

Comments
 (0)