Skip to content

Commit

Permalink
PR Suggestions
Browse files Browse the repository at this point in the history
Signed-off-by: Philipp Schlarb <p.schlarb@esatus.com>
  • Loading branch information
pSchlarb committed May 13, 2022
1 parent f63ff84 commit 5810660
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 150 deletions.
23 changes: 0 additions & 23 deletions .github/actions/publish-deb/action.yaml

This file was deleted.

33 changes: 0 additions & 33 deletions .github/actions/publish-deb/publishPackages

This file was deleted.

8 changes: 0 additions & 8 deletions .github/actions/publish-deb/upload-spec.json

This file was deleted.

63 changes: 0 additions & 63 deletions .github/actions/set-version/action.yaml

This file was deleted.

17 changes: 3 additions & 14 deletions .github/workflows/PR.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
- feature/did-indy*
paths:
- '**.py'
- '.github/**'
- 'build-scripts/**'
- 'bump_version.sh'
workflow_dispatch:

jobs:
Expand Down Expand Up @@ -60,17 +63,3 @@ jobs:
isDev: true
isRC: false
moduleName: indy_node

publish_artifacts:
name: Publish Artifacts
needs: [workflow-setup, build_packages]
if: needs.workflow-setup.outputs.publish == 'true'
uses: hyperledger/indy-shared-gha/.github/workflows/publish_artifacts.yaml@main
with:
COMPONENT: 'dev'
UBUNTU_VERSION: ${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}
distribution: ${{ needs.workflow-setup.outputs.distribution }}
moduleName: indy_node
secrets:
INDY_ARTIFACTORY_REPO_CONFIG: ${{ secrets.INDY_ARTIFACTORY_REPO_CONFIG }}
PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
5 changes: 4 additions & 1 deletion .github/workflows/Push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ on:
- feature/did-indy*
paths:
- '**.py'

- '.github/**'
- 'build-scripts/**'
- 'bump_version.sh'

jobs:
workflow-setup:
name: Initialize Workflow
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ which only contain changes to python files. If no python file is affected it doe
The same applies to the [Push](Push.yaml) workflow respectively for pushes.

The [tag](tag.yaml), [releasepr](releasepr.yaml) and [publishRelease](publishRelease.yaml) workflows are used for the new [Release Workflow](../../docs/release-workflow.png).
They use reuseable workflows from the [indy-shared-gha](https://github.com/hyperledger) repository and the following workflow in this folder.
They use reuseable workflows from the [indy-shared-gha](https://github.com/hyperledger/indy-shared-gha) repository and the following workflow in this folder.

+ [reuseable_test.yaml](reuseable_test.yaml)
This workflow runs the tests inside the uploaded docker images.
File renamed without changes.
11 changes: 6 additions & 5 deletions .github/workflows/publishRelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
# to be in lowercase.
GITHUB_REPOSITORY_NAME: ${{ steps.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}
distribution: ${{ steps.workflow-setup.outputs.distribution }}
publish: ${{ steps.workflow-setup.outputs.publish}}
steps:
- name: checkout source code
uses: actions/checkout@v2
Expand All @@ -48,23 +49,23 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Download Node Artifacts from Github Action Artifacts
- name: Download Node deb Artifacts from Github Action Artifacts
uses: dawidd6/action-download-artifact@v2
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: releasepr.yaml
workflow_conclusion: success
name: indy_node-deb
path: artifacts/indy_node-deb
- name: Download Node Artifacts from Github Action Artifacts
- name: Download Node python Artifacts from Github Action Artifacts
uses: dawidd6/action-download-artifact@v2
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: releasepr.yaml
workflow_conclusion: success
name: indy_node-python
path: artifacts/indy_node-python
- name: Download Node Artifacts from Github Action Artifacts
- name: Download Node third party dependency Artifacts from Github Action Artifacts
uses: dawidd6/action-download-artifact@v2
with:
github_token: ${{secrets.GITHUB_TOKEN}}
Expand Down Expand Up @@ -92,7 +93,7 @@ jobs:
zip -r artifacts/indy_node-deb.zip artifacts/indy_node-deb
zip -r artifacts/indy_node-python.zip artifacts/indy_node-python
zip -r artifacts/third-party-dependencies.zip artifacts/third-party-dependencies
- name: Release
- name: Generate Release
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ needs.release-infos.outputs.VERSIONTAG }}
Expand All @@ -108,7 +109,7 @@ jobs:
publish_artifacts:
name: Publish Artifacts
needs: [release-infos, createRelease]
if: needs.release-infos.outputs.isVersionBump == 'true'
if: needs.release-infos.outputs.isVersionBump == 'true' && needs.release-infos.outputs.publish == 'true'
uses: hyperledger/indy-shared-gha/.github/workflows/publish_artifacts.yaml@main
with:
COMPONENT: ${{ needs.release-infos.component }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/releasepr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ jobs:
if: needs.release-infos.outputs.isVersionBump == 'true'
uses: hyperledger/indy-shared-gha/.github/workflows/lint.yaml@main

build-image:
build-docker-image:
name: Create Builder Image
needs: [release-infos, lint]
if: needs.release-infos.outputs.isVersionBump == 'true'
uses: hyperledger/indy-shared-gha/.github/workflows/buildimage.yaml@main
with:
CACHE_KEY_BUILD: ${{ needs.release-infos.outputs.CACHE_KEY_BUILD }}
Expand All @@ -52,6 +53,7 @@ jobs:
indy_node_tests:
name: Indy Node Tests
needs: [release-infos, build-image]
if: needs.release-infos.outputs.isVersionBump == 'true'
uses: ./.github/workflows/reuseable_test.yaml
with:
GITHUB_REPOSITORY_NAME: ${{ needs.release-infos.outputs.GITHUB_REPOSITORY_NAME }}
Expand Down
16 changes: 15 additions & 1 deletion .github/workflows/tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,21 @@ jobs:
with:
python-version: '3.8'
- name: Install deps for version change
run: pip install base58
run: |
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9692C00E657DDE61
sudo add-apt-repository 'deb https://hyperledger.jfrog.io/artifactory/indy focal dev'
sudo apt-get update -y && sudo apt-get install -y \
rocksdb=5.8.8 \
libgflags-dev \
libsnappy-dev \
zlib1g-dev \
libbz2-dev \
liblz4-dev \
libgflags-dev \
pip install packaging \
importlib_metadata==3.10.1 \
indy-plenum==1.13.0.dev14 \
pyzmq==22.3.0
- name: Prepare package and set version
run: |
./bump_version.sh ${{ needs.taginfos.outputs.VERSION }}
Expand Down

0 comments on commit 5810660

Please sign in to comment.