Skip to content

Commit b534766

Browse files
authored
Merge pull request #2 from AldanDev/uv-ca
Use codeartifact with uv
2 parents 9495993 + 223612f commit b534766

File tree

3 files changed

+43
-20
lines changed

3 files changed

+43
-20
lines changed

.github/workflows/changelog.yaml

+21-10
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,23 @@ jobs:
4444

4545
- name: Get AWS Code Artifact token
4646
if: ${{ inputs.use_codeartifact }}
47-
run: >-
48-
echo "POETRY_HTTP_BASIC_ARTIFACT_PASSWORD=$(aws
49-
codeartifact
50-
get-authorization-token
51-
--domain ${{ inputs.AWS_CODEARTIFACT_DOMAIN }}
52-
--region ${{ inputs.AWS_CODEARTIFACT_REGION }}
53-
--query authorizationToken
54-
--output text)"
55-
>> $GITHUB_ENV
47+
run: |
48+
echo "AWS_CODEARTIFACT_TOKEN=$(aws codeartifact get-authorization-token \
49+
--domain ${{ inputs.AWS_CODEARTIFACT_DOMAIN }} \
50+
--region ${{ inputs.AWS_CODEARTIFACT_REGION }} \
51+
--query authorizationToken \
52+
--output text)" >> $GITHUB_ENV
53+
54+
- name: Set Poetry Code Artifact token
55+
if: ${{ inputs.use_codeartifact && inputs.package-manager == 'poetry' }}
56+
run: echo "POETRY_HTTP_BASIC_ARTIFACT_PASSWORD=$AWS_CODEARTIFACT_TOKEN" >> $GITHUB_ENV
57+
58+
- name: Set uv Code Artifact token
59+
if: ${{ inputs.use_codeartifact && inputs.package-manager == 'uv' }}
60+
run: echo "UV_INDEX=https://aws:$AWS_CODEARTIFACT_TOKEN@${{ inputs.AWS_CODEARTIFACT_DOMAIN }}.d.codeartifact.${{ inputs.AWS_CODEARTIFACT_REGION }}.amazonaws.com/pypi/simple/" >> $GITHUB_ENV
5661

5762
- run: sudo apt-get install -y gettext
63+
if: ${{ inputs.use_codeartifact }}
5864

5965
- name: Set up python
6066
uses: actions/setup-python@v5
@@ -112,10 +118,15 @@ jobs:
112118
working-directory: base
113119

114120
- name: Compile locales
115-
if: ${{ inputs.use_codeartifact }}
121+
if: ${{ inputs.use_codeartifact && inputs.package-manager == 'poetry' }}
116122
run: poetry run python -m ${{ inputs.modules }} compile
117123
working-directory: base
118124

125+
- name: Compile locales
126+
if: ${{ inputs.use_codeartifact && inputs.package-manager == 'uv' }}
127+
run: uv run python -m ${{ inputs.modules }} compile
128+
working-directory: base
129+
119130
- name: Generate specification
120131
run: make generate-spec
121132
working-directory: base

.github/workflows/changes.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_call:
55
outputs:
66
app:
7-
description: "If chahges in the files"
7+
description: "If changes in the files"
88
value: ${{ jobs.changes.outputs.app }}
99

1010
jobs:

.github/workflows/test.yaml

+21-9
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,20 @@ jobs:
6767

6868
- name: Get AWS Code Artifact token
6969
if: ${{ inputs.use_codeartifact }}
70-
run: >-
71-
echo "POETRY_HTTP_BASIC_ARTIFACT_PASSWORD=$(aws
72-
codeartifact
73-
get-authorization-token
74-
--domain ${{ inputs.AWS_CODEARTIFACT_DOMAIN }}
75-
--region ${{ inputs.AWS_CODEARTIFACT_REGION }}
76-
--query authorizationToken
77-
--output text)"
78-
>> $GITHUB_ENV
70+
run: |
71+
echo "AWS_CODEARTIFACT_TOKEN=$(aws codeartifact get-authorization-token \
72+
--domain ${{ inputs.AWS_CODEARTIFACT_DOMAIN }} \
73+
--region ${{ inputs.AWS_CODEARTIFACT_REGION }} \
74+
--query authorizationToken \
75+
--output text)" >> $GITHUB_ENV
76+
77+
- name: Set Poetry Code Artifact token
78+
if: ${{ inputs.use_codeartifact && inputs.package-manager == 'poetry' }}
79+
run: echo "POETRY_HTTP_BASIC_ARTIFACT_PASSWORD=$AWS_CODEARTIFACT_TOKEN" >> $GITHUB_ENV
80+
81+
- name: Set uv Code Artifact token
82+
if: ${{ inputs.use_codeartifact && inputs.package-manager == 'uv' }}
83+
run: echo "UV_INDEX=https://aws:$AWS_CODEARTIFACT_TOKEN@${{ inputs.AWS_CODEARTIFACT_DOMAIN }}.d.codeartifact.${{ inputs.AWS_CODEARTIFACT_REGION }}.amazonaws.com/pypi/simple/" >> $GITHUB_ENV
7984

8085
- name: Setup APT dependencies
8186
run: sudo apt-get install -y gettext
@@ -96,6 +101,13 @@ jobs:
96101
run: make lint
97102

98103
- name: Run tests
104+
if: ${{ inputs.package-manager == 'poetry' }}
99105
run: make docker-test
100106
env:
101107
CODEARTIFACT_TOKEN: ${{ env.POETRY_HTTP_BASIC_ARTIFACT_PASSWORD }}
108+
109+
- name: Run tests
110+
if: ${{ inputs.package-manager == 'uv' }}
111+
run: make docker-test
112+
env:
113+
CODEARTIFACT_TOKEN: ${{ env.UV_INDEX }}

0 commit comments

Comments
 (0)