Skip to content

Commit

Permalink
Update aries-cloudagent references
Browse files Browse the repository at this point in the history
Signed-off-by: Jamie Hale <jamiehalebc@gmail.com>
  • Loading branch information
jamshale committed Oct 7, 2024
1 parent 58d81b5 commit 112e708
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/post-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ WORKSPACE_DIR=$(pwd)
python -m pip install --upgrade pip
pip3 install -r demo/requirements.txt -r demo/requirements.behave.txt

# install a version of aries-cloudagent so the pytests can pick up a version
pip3 install aries-cloudagent
# install a version of acapy-agent so the pytests can pick up a version
pip3 install acapy-agent

# hack/workaround to allow `pytest .` and `poetry run pytest` work.
# need to not run ruff...
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/is-release/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ runs:
changes=$(git diff "${{ github.sha }}" "$last_merge" pyproject.toml)
# Extract the version of aries-cloudagent from the diff of pyproject.toml
# Extract the version of acapy-agent from the diff of pyproject.toml
version=$(echo "$changes" | grep -A1 'name = "acapy_agent"' | head -n 2 | tail -n 1 | awk '{print $3}' | tr -d '"')
echo "$version"
if [ "$version" ]; then
echo "This is a release because the aries-cloudagent version in pyproject.toml has changes"
echo "This is a release because the acapy-agent version in pyproject.toml has changes"
echo is_release=true >> $GITHUB_OUTPUT
fi
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/${{ steps.info.outputs.repo-owner }}/aries-cloudagent-python
ghcr.io/${{ steps.info.outputs.repo-owner }}/acapy-agent
tags: |
type=raw,value=py${{ matrix.python-version }}-${{ inputs.tag || github.event.release.tag_name }}
Expand All @@ -108,7 +108,7 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/${{ steps.info.outputs.repo-owner }}/aries-cloudagent-bbs
ghcr.io/${{ steps.info.outputs.repo-owner }}/acapy-agent-bbs
tags: |
type=raw,value=py${{ matrix.python-version }}-${{ inputs.tag || github.event.release.tag_name }}
Expand All @@ -123,7 +123,7 @@ jobs:
target: main
build-args: |
python_version=${{ matrix.python-version }}
acapy_name=aries-cloudagent-bbs
acapy_name=acapy-agent-bbs
acapy_version=${{ inputs.tag || github.event.release.tag_name }}
acapy_reqs=[askar,bbs,didcommv2]
cache-from: type=local,src=/tmp/.buildx-cache
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/snyk-lts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ on:
jobs:
snyk:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'hyperledger' }}
if: ${{ github.repository_owner == 'openwallet-foundation' }}
steps:
- uses: actions/checkout@v4

- name: Build a Docker image
run: docker build -t aries-cloudagent -f docker/Dockerfile .
run: docker build -t acapy-agent -f docker/Dockerfile .

- name: Run Snyk to check Docker image for vulnerabilities
# Snyk can be used to break the build when it detects vulnerabilities.
Expand All @@ -31,7 +31,7 @@ jobs:
# or you can signup for free at https://snyk.io/login
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
with:
image: aries-cloudagent
image: acapy-agent
args: --file=docker/Dockerfile
# Adding a snyk monitor command which continuously monitors the image for vulnerabilities
# See https://support.snyk.io/hc/en-us/articles/360000920818-What-are-the-differences-among-snyk-test-monitor-and-protect for more details
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snyk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4

- name: Build a Docker image
run: docker build -t aries-cloudagent -f docker/Dockerfile .
run: docker build -t acapy-agent -f docker/Dockerfile .

- name: Run Snyk to check Docker image for vulnerabilities
# Snyk can be used to break the build when it detects vulnerabilities.
Expand All @@ -28,7 +28,7 @@ jobs:
# or you can signup for free at https://snyk.io/login
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
with:
image: aries-cloudagent
image: acapy-agent
args: --file=docker/Dockerfile

# Replace any "null" security severity values with 0. The null value is used in the case
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar-merge-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Adjust Test Coverage Source
run: |
# Need to change source in coverage report because it was generated from another context
sed -i 's/\/home\/runner\/work\/aries-cloudagent-python\/aries-cloudagent-python\//\/github\/workspace\//g' test-reports/coverage.xml
sed -i 's/\/home\/runner\/work\/acapy-agent\/acapy-agent\//\/github\/workspace\//g' test-reports/coverage.xml
- name: SonarCloud Scan
uses: SonarSource/sonarcloud-github-action@master
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
mkdir test-reports
mv coverage.xml test-reports
# Need to change source in coverage report because it was generated from another context
sed -i 's/\/home\/runner\/work\/aries-cloudagent-python\/aries-cloudagent-python\//\/github\/workspace\//g' test-reports/coverage.xml
sed -i 's/\/home\/runner\/work\/acapy-agent\/acapy-agent\//\/github\/workspace\//g' test-reports/coverage.xml
- name: SonarCloud Scan
uses: SonarSource/sonarcloud-github-action@master
env:
Expand Down
2 changes: 1 addition & 1 deletion acapy_agent/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

from importlib import metadata

__version__ = metadata.version("aries-cloudagent")
__version__ = metadata.version("acapy-agent")
RECORD_TYPE_ACAPY_VERSION = "acapy_version"
6 changes: 3 additions & 3 deletions sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sonar.projectKey=hyperledger_aries-cloudagent-python
sonar.organization=hyperledger
sonar.projectName=aries-cloudagent-python
sonar.projectKey=openwallet-foundation_acapy
sonar.organization=openwallet-foundation
sonar.projectName=acapy

sonar.python.version=3.12

0 comments on commit 112e708

Please sign in to comment.