Skip to content

Commit f358c1b

Browse files
authored
Patch PR 3391 - 0.12.lts (openwallet-foundation#3396)
* Backport PR 3391 Signed-off-by: jamshale <jamiehalebc@gmail.com> * Change pypi publish workflow Signed-off-by: jamshale <jamiehalebc@gmail.com> --------- Signed-off-by: jamshale <jamiehalebc@gmail.com>
1 parent 1631eb9 commit f358c1b

3 files changed

Lines changed: 13 additions & 16 deletions

File tree

.github/workflows/publish.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ jobs:
5151
uses: actions/checkout@v4
5252
with:
5353
ref: ${{ inputs.ref || '' }}
54-
55-
- name: Gather image info
56-
id: info
57-
run: |
58-
echo "repo-owner=${GITHUB_REPOSITORY_OWNER,,}" >> $GITHUB_OUTPUT
59-
6054
- name: Cache Docker layers
6155
uses: actions/cache@v4
6256
with:
@@ -72,15 +66,15 @@ jobs:
7266
uses: docker/login-action@v3
7367
with:
7468
registry: ghcr.io
75-
username: ${{ github.repository_owner }}
76-
password: ${{ secrets.GITHUB_TOKEN }}
69+
username: hyperledger
70+
password: ${{ secrets.HYPERLEDGER_GHCR_PAT }}
7771

7872
- name: Setup Image Metadata
7973
id: meta
8074
uses: docker/metadata-action@v5
8175
with:
8276
images: |
83-
ghcr.io/${{ steps.info.outputs.repo-owner }}/aries-cloudagent-python
77+
ghcr.io/hyperledger/aries-cloudagent-python
8478
tags: |
8579
type=raw,value=py${{ matrix.python-version }}-${{ inputs.tag || github.event.release.tag_name }}
8680

.github/workflows/pythonpublish.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,23 @@ on:
77
jobs:
88
deploy:
99
runs-on: ubuntu-latest
10+
environment:
11+
name: pypi
12+
url: https://pypi.org/p/aries-cloudagent
13+
permissions:
14+
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
1015
steps:
1116
- uses: actions/checkout@v4
1217
- name: Set up Python
1318
uses: actions/setup-python@v5
1419
with:
15-
python-version: "3.x"
16-
- name: Install dependencies
20+
python-version: "3.9"
21+
- name: Install build and publish dependencies
1722
run: |
1823
python -m pip install --upgrade pip
1924
pip install setuptools wheel twine poetry
2025
- name: Build and publish
21-
env:
22-
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
23-
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
2426
run: |
2527
poetry build
26-
twine upload dist/*
28+
- name: Publish package distributions to PyPI
29+
uses: pypa/gh-action-pypi-publish@release/v1

aries_cloudagent/askar/profile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def bind_providers(self):
118118
VCHolder,
119119
ClassProvider(
120120
"aries_cloudagent.storage.vc_holder.askar.AskarVCHolder",
121-
ref(self),
121+
ClassProvider.Inject(Profile),
122122
),
123123
)
124124
if (

0 commit comments

Comments
 (0)