Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update indy-node dependency to 1.13.2-rc4 #442

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/PR.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- ubuntu-20.04-upgrade
- Devcontainers
- GHARefactoring
- fix/dependancy-scheme
paths:
- '**'
- '!sovtokenfees/sovtokenfees/metadata.json'
Expand Down Expand Up @@ -59,23 +60,23 @@ jobs:
CACHE_KEY_BUILD: ${{ needs.workflow-setup.outputs.CACHE_KEY_BUILD }}
DOCKER_IMAGE: ghcr.io/${{ needs.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}/token-plugin-build
UBUNTU_VERSION: ${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}

token-plugin-tests:
name: Token Plugin Tests
needs: [workflow-setup, build-image]
uses: ./.github/workflows/reuseable_test.yaml
with:
GITHUB_REPOSITORY_NAME: ${{ needs.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}
UBUNTU_VERSION: ${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}
UBUNTU_VERSION: ${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}

build-packages:
name: Token Plugin Build package
needs: [workflow-setup, token-plugin-tests]
uses: ./.github/workflows/reuseable_build_package.yaml
with:
GITHUB_REPOSITORY_NAME: ${{ needs.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}
UBUNTU_VERSION: ${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}
UBUNTU_VERSION: ${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}

statusCheck:
name: statusCheck
runs-on: ubuntu-latest
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/Push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ on:
- ubuntu-20.04-upgrade
- Devcontainers
- GHARefactoring
- fix/dependancy-scheme
paths:
- '**.py'
- '.github/**'

jobs:
workflow-setup:
name: Initialize Workflow
Expand Down Expand Up @@ -49,14 +50,14 @@ jobs:
CACHE_KEY_BUILD: ${{ needs.workflow-setup.outputs.CACHE_KEY_BUILD }}
DOCKER_IMAGE: ghcr.io/${{ needs.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}/token-plugin-build
UBUNTU_VERSION: ${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}

token-plugin-tests:
name: Token Plugin Tests
needs: [workflow-setup, build-image]
uses: ./.github/workflows/reuseable_test.yaml
with:
GITHUB_REPOSITORY_NAME: ${{ needs.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}
UBUNTU_VERSION: ${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}
UBUNTU_VERSION: ${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}

build-package:
name: Token Plugin Build package
Expand All @@ -65,17 +66,17 @@ jobs:
with:
GITHUB_REPOSITORY_NAME: ${{ needs.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}
UBUNTU_VERSION: ${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}
isDev: true
isDev: true

publish-package:
name: Token Plugin Publish Packages
needs: [workflow-setup, build-package]
if: needs.workflow-setup.outputs.publish == 'true'
if: needs.workflow-setup.outputs.publish == 'true'
uses: ./.github/workflows/reuseable_publish.yaml
with:
GITHUB_REPOSITORY_NAME: ${{ needs.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}
UBUNTU_VERSION: ${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}
REPO_COMPONENT: 'dev'
REPO_COMPONENT: 'dev'
distribution: ${{ needs.workflow-setup.outputs.distribution }}
secrets:
SOVRIN_ARTIFACTORY_REPO_CONFIG: ${{ secrets.SOVRIN_ARTIFACTORY_REPO_CONFIG }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publishRelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Download sovtoken deb Artifacts from Github Action Artifacts
uses: dawidd6/action-download-artifact@v2
with:
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: sovtokenfees-python
path: artifacts/sovtokenfees-python
path: artifacts/sovtokenfees-python
- name: Generate Release
uses: softprops/action-gh-release@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/releasepr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
uses: ./.github/workflows/reuseable_test.yaml
with:
GITHUB_REPOSITORY_NAME: ${{ needs.release-infos.outputs.GITHUB_REPOSITORY_NAME }}
UBUNTU_VERSION: ${{ needs.release-infos.outputs.UBUNTU_VERSION }}
UBUNTU_VERSION: ${{ needs.release-infos.outputs.UBUNTU_VERSION }}

build-packages:
name: Token Plugin Build package
Expand All @@ -67,7 +67,7 @@ jobs:
with:
GITHUB_REPOSITORY_NAME: ${{ needs.release-infos.outputs.GITHUB_REPOSITORY_NAME }}
UBUNTU_VERSION: ${{ needs.release-infos.outputs.UBUNTU_VERSION }}
isDev: false
isDev: false

statusCheck:
name: statusCheck
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reuseable_build_package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
id: node-version
shell: bash
run: |
version=$(grep -oP "\d+.\d+.\d+((-|.)?rc\d+)?" <<< $(grep -oP "indy-node==\d+.\d+.\d+((-|.)?rc\d+)?" sovtokenfees/setup.py) || true)
version=$(grep -oP "\d+.\d+.\d+((-|.)?rc\d+)?" <<< $(grep -oP "indy-node==\d+.\d+.\d+((-|.)?rc\d+)?" sovtoken/setup.py) || true)
echo $version > indy-node-version.txt
echo "nodeVersion=$(sed 's/\./\~/3' indy-node-version.txt)" >> $GITHUB_OUTPUT
- name: Build Token Plugin deployment package
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/reuseable_publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
publish_token_plugin_deb:
name: Token Plugin Publish Packages
runs-on: ubuntu-20.04
steps:
steps:
- name: Setup JFrog CLI
uses: jfrog/setup-jfrog-cli@v2
env:
Expand Down Expand Up @@ -64,4 +64,3 @@ jobs:
component: ${{ inputs.REPO_COMPONENT }}
repo: "deb"


2 changes: 1 addition & 1 deletion .github/workflows/reuseable_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Install dependencies
run: |
bash ./install_payment_plugins.sh

- name: Run Token Plugin ${{ matrix.module }} / ${{ matrix.dir }}
id: token-plugin-test
run: cd ${{ matrix.module }}/${{ matrix.module }}/test && python3 -m pytest -l -vv --junitxml=test-result-token-plugin-"${{ matrix.module }}"-"${{ matrix.dir }}".xml ${{ matrix.dir }}
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Triggered by set Tag

on:
push:
tags:
tags:
- setRelease-v**

jobs:
Expand All @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: extract branch
- name: extract branch
id: get-branch
uses: hyperledger/indy-shared-gha/.github/actions/branch-from-tag@v1
with:
Expand All @@ -43,7 +43,7 @@ jobs:
python-version: '3.8'
- name: Set up python
run: |
pip3 install semver
pip3 install semver
- name: Prepare package and set version
run: |
python3 updateVersion.py -t ${{ needs.taginfos.outputs.VERSION }}
Expand All @@ -61,4 +61,3 @@ jobs:
body: "[${{ needs.taginfos.outputs.versionTag }}] - Update Version number for Release"
delete-branch: true
token: ${{ secrets.BOT_PR_PAT }}

2 changes: 1 addition & 1 deletion devops/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ifeq ($(SRC_DIR_NAME),sovtoken)
# apt: indy-plenum (stable component)

FPM_P_NAME += $(PACKAGE_NAME)
FPM_P_DEPENDS := indy-node(=1.13.0~dev1225)
FPM_P_DEPENDS := indy-node(=1.13.2~rc4)
FPM_ARGS := --no-python-dependencies $(FPM_ARGS) ../$(SRC_DIR_NAME)
endif

Expand Down
4 changes: 2 additions & 2 deletions sovtoken/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
with open(os.path.join(here, 'sovtoken', '__metadata__.py'), 'r') as f:
exec(f.read(), metadata)

tests_require = ['pip==9.0.3', 'pytest-xdist', 'mock', 'python-rocksdb==0.6.9', 'indy-node==1.13.2.rc3']
tests_require = ['pip==9.0.3', 'pytest-xdist', 'mock', 'python-rocksdb==0.6.9', 'python3-indy==1.16.0.post286']

setup(
name=metadata['__title__'],
Expand All @@ -43,7 +43,7 @@
'*.css', '*.ico', '*.png', 'LICENSE', 'LEGAL', 'sovtoken']},
include_package_data=True,

install_requires=[],
install_requires=['indy-node==1.13.2.rc4'],

setup_requires=['pytest-runner'],
extras_require={
Expand Down
2 changes: 1 addition & 1 deletion sovtokenfees/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
with open(metadata['__file__'], 'r') as f:
exec(f.read(), metadata)

tests_require = ['attrs==19.1.0', 'pytest==4.6.2', 'pytest-xdist', 'python3-indy==1.16.0.post286', 'indy-node==1.13.2.rc3']
tests_require = ['attrs==19.1.0', 'pytest==4.6.2', 'pytest-xdist', 'python3-indy==1.16.0.post286']

setup(

Expand Down