Skip to content

Commit df93c0b

Browse files
iancoianco
authored
Merge branch 'main' into vlee/lightwebhook
2 parents dd6fcf3 + 3c3a668 commit df93c0b

144 files changed

Lines changed: 1703 additions & 748 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dockerignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ build
66
docs
77
dist
88
test-reports
9-
.python-version
9+
.python-version
10+
docker
11+
env

actions/run-indy-tails-server/action.yml renamed to .github/actions/run-indy-tails-server/action.yml

File renamed without changes.

actions/run-integration-tests/action.yml renamed to .github/actions/run-integration-tests/action.yml

File renamed without changes.

actions/run-von-network/action.yml renamed to .github/actions/run-von-network/action.yml

File renamed without changes.

‎.github/workflows/blackformat.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ jobs:
1010
name: lint
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
14-
- uses: actions/setup-python@v2
13+
- uses: actions/checkout@v3
14+
- uses: actions/setup-python@v4
15+
with:
16+
python-version: "3.9"
1517
- name: Black Code Formatter Check
1618
uses: psf/black@stable

‎.github/workflows/codeql.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,18 @@ jobs:
1212
runs-on: ubuntu-latest
1313
if: (github.event_name == 'pull_request' && github.repository == 'hyperledger/aries-cloudagent-python') || (github.event_name != 'pull_request')
1414

15+
permissions:
16+
security-events: write
17+
1518
steps:
1619
- name: Checkout repository
17-
uses: actions/checkout@v2
20+
uses: actions/checkout@v3
1821

1922
# Initializes the CodeQL tools for scanning.
2023
- name: Initialize CodeQL
21-
uses: github/codeql-action/init@v1
24+
uses: github/codeql-action/init@v2
2225
with:
2326
languages: python
2427

2528
- name: Perform CodeQL Analysis
26-
uses: github/codeql-action/analyze@v1
29+
uses: github/codeql-action/analyze@v2

‎.github/workflows/integrationtests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
if: (github.event_name == 'pull_request' && github.repository == 'hyperledger/aries-cloudagent-python') || (github.event_name != 'pull_request')
1414
steps:
1515
- name: checkout-acapy
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717
with:
1818
path: acapy
1919
#- name: run-von-network
20-
# uses: ./acapy/actions/run-von-network
20+
# uses: ./acapy/.github/actions/run-von-network
2121
#- name: run-indy-tails-server
22-
# uses: ./acapy/actions/run-indy-tails-server
22+
# uses: ./acapy/.github/actions/run-indy-tails-server
2323
- name: run-integration-tests
24-
uses: ./acapy/actions/run-integration-tests
24+
uses: ./acapy/.github/actions/run-integration-tests
2525
# to run with a specific set of tests include the following parameter:
2626
# with:
2727
# TEST_SCOPE: "-t @T001-RFC0037"

‎.github/workflows/publish-indy.yml‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
name: Publish ACA-Py Image (Indy)
2+
run-name: Publish ACA-Py ${{ inputs.tag || github.event.release.tag_name }} Image (Indy ${{ inputs.indy_version || '1.16.0' }})
3+
on:
4+
release:
5+
types: [released]
6+
7+
workflow_dispatch:
8+
inputs:
9+
indy_version:
10+
description: 'Indy SDK Version'
11+
required: true
12+
default: 1.16.0
13+
type: string
14+
tag:
15+
description: 'Image tag'
16+
required: true
17+
type: string
18+
19+
# Note:
20+
# - ACA-Py with Indy SDK image builds do not include support for the linux/arm64 platform.
21+
# - See notes below for details.
22+
23+
env:
24+
INDY_VERSION: ${{ inputs.indy_version || '1.16.0' }}
25+
26+
jobs:
27+
publish-image:
28+
strategy:
29+
fail-fast: false
30+
matrix:
31+
python-version: ['3.6', '3.9']
32+
33+
name: Publish ACA-Py Image (Indy)
34+
runs-on: ubuntu-latest
35+
steps:
36+
- name: Checkout Code
37+
uses: actions/checkout@v3
38+
39+
- name: Gather image info
40+
id: info
41+
run: |
42+
echo "repo-owner=${GITHUB_REPOSITORY_OWNER,,}" >> $GITHUB_OUTPUT
43+
44+
- name: Cache Docker layers
45+
uses: actions/cache@v3
46+
with:
47+
path: /tmp/.buildx-cache
48+
key: ${{ runner.os }}-buildx-${{ github.sha }}
49+
restore-keys: |
50+
${{ runner.os }}-buildx-
51+
52+
- name: Set up Docker Buildx
53+
uses: docker/setup-buildx-action@v2
54+
55+
- name: Log in to the GitHub Container Registry
56+
uses: docker/login-action@v2
57+
with:
58+
registry: ghcr.io
59+
username: ${{ github.repository_owner }}
60+
password: ${{ secrets.GITHUB_TOKEN }}
61+
62+
- name: Setup Image Metadata
63+
id: meta
64+
uses: docker/metadata-action@v4
65+
with:
66+
images: |
67+
ghcr.io/${{ steps.info.outputs.repo-owner }}/aries-cloudagent-python
68+
tags: |
69+
type=raw,value=py${{ matrix.python-version }}-indy-${{ env.INDY_VERSION }}-${{ inputs.tag || github.event.release.tag_name }}
70+
71+
- name: Build and Push Image to ghcr.io
72+
uses: docker/build-push-action@v3
73+
with:
74+
push: true
75+
context: .
76+
file: docker/Dockerfile.indy
77+
tags: ${{ steps.meta.outputs.tags }}
78+
labels: ${{ steps.meta.outputs.labels }}
79+
target: main
80+
build-args: |
81+
python_version=${{ matrix.python-version }}
82+
indy_version=${{ env.INDY_VERSION }}
83+
acapy_version=${{ inputs.tag || github.event.release.tag_name }}
84+
cache-from: type=local,src=/tmp/.buildx-cache
85+
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
86+
# Images do not include support for the linux/arm64 platform due to a known issue compiling the postgres plugin
87+
# - https://github.com/hyperledger/indy-sdk/issues/2445
88+
# There is a pending PR to fix this issue here; https://github.com/hyperledger/indy-sdk/pull/2453
89+
platforms: linux/amd64,linux/386
90+
91+
# Temp fix
92+
# https://github.com/docker/build-push-action/issues/252
93+
# https://github.com/moby/buildkit/issues/1896
94+
- name: Move cache
95+
run: |
96+
rm -rf /tmp/.buildx-cache
97+
mv /tmp/.buildx-cache-new /tmp/.buildx-cache

‎.github/workflows/publish.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: Publish ACA-Py Image
2+
run-name: Publish ACA-Py ${{ inputs.tag || github.event.release.tag_name }} Image
3+
on:
4+
release:
5+
types: [released]
6+
7+
workflow_dispatch:
8+
inputs:
9+
tag:
10+
description: 'Image tag'
11+
required: true
12+
type: string
13+
14+
jobs:
15+
publish-image:
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
python-version: ['3.6', '3.9']
20+
21+
name: Publish ACA-Py Image
22+
runs-on: ubuntu-latest
23+
steps:
24+
- name: Checkout Code
25+
uses: actions/checkout@v3
26+
27+
- name: Gather image info
28+
id: info
29+
run: |
30+
echo "repo-owner=${GITHUB_REPOSITORY_OWNER,,}" >> $GITHUB_OUTPUT
31+
32+
- name: Cache Docker layers
33+
uses: actions/cache@v3
34+
with:
35+
path: /tmp/.buildx-cache
36+
key: ${{ runner.os }}-buildx-${{ github.sha }}
37+
restore-keys: |
38+
${{ runner.os }}-buildx-
39+
40+
- name: Set up Docker Buildx
41+
uses: docker/setup-buildx-action@v2
42+
43+
- name: Log in to the GitHub Container Registry
44+
uses: docker/login-action@v2
45+
with:
46+
registry: ghcr.io
47+
username: ${{ github.repository_owner }}
48+
password: ${{ secrets.GITHUB_TOKEN }}
49+
50+
- name: Setup Image Metadata
51+
id: meta
52+
uses: docker/metadata-action@v4
53+
with:
54+
images: |
55+
ghcr.io/${{ steps.info.outputs.repo-owner }}/aries-cloudagent-python
56+
tags: |
57+
type=raw,value=py${{ matrix.python-version }}-${{ inputs.tag || github.event.release.tag_name }}
58+
59+
- name: Build and Push Image to ghcr.io
60+
uses: docker/build-push-action@v3
61+
with:
62+
push: true
63+
context: .
64+
file: docker/Dockerfile
65+
tags: ${{ steps.meta.outputs.tags }}
66+
labels: ${{ steps.meta.outputs.labels }}
67+
target: main
68+
build-args: |
69+
python_version=${{ matrix.python-version }}
70+
acapy_version=${{ inputs.tag || github.event.release.tag_name }}
71+
cache-from: type=local,src=/tmp/.buildx-cache
72+
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
73+
platforms: linux/amd64,linux/arm64,linux/386
74+
75+
# Temp fix
76+
# https://github.com/docker/build-push-action/issues/252
77+
# https://github.com/moby/buildkit/issues/1896
78+
- name: Move cache
79+
run: |
80+
rm -rf /tmp/.buildx-cache
81+
mv /tmp/.buildx-cache-new /tmp/.buildx-cache

‎.github/workflows/pythonpublish.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ jobs:
88
deploy:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v1
12-
- name: Set up Python
13-
uses: actions/setup-python@v1
14-
with:
15-
python-version: '3.x'
16-
- name: Install dependencies
17-
run: |
18-
python -m pip install --upgrade pip
19-
pip install setuptools wheel twine
20-
- name: Build and publish
21-
env:
22-
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
23-
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
24-
run: |
25-
python setup.py sdist bdist_wheel
26-
twine upload dist/*
11+
- uses: actions/checkout@v3
12+
- name: Set up Python
13+
uses: actions/setup-python@v4
14+
with:
15+
python-version: "3.x"
16+
- name: Install dependencies
17+
run: |
18+
python -m pip install --upgrade pip
19+
pip install setuptools wheel twine
20+
- name: Build and publish
21+
env:
22+
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
23+
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
24+
run: |
25+
python setup.py sdist bdist_wheel
26+
twine upload dist/*

0 commit comments

Comments
 (0)