From 02dc58814ccbef0e0e16d4952d323b4de077f631 Mon Sep 17 00:00:00 2001 From: pSchlarb Date: Thu, 11 Aug 2022 15:56:22 +0200 Subject: [PATCH] included sovrin checking and corrected version for subactions Signed-off-by: pSchlarb Update .github/actions/workflow-setup/action.yaml Co-authored-by: Wade Barnes generalized owner Repo Signed-off-by: pSchlarb --- .github/actions/workflow-setup/action.yaml | 9 +++++++-- .github/workflows/buildpackages.yaml | 4 ++-- .github/workflows/publish_artifacts.yaml | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/actions/workflow-setup/action.yaml b/.github/actions/workflow-setup/action.yaml index 52983d5..5928eda 100644 --- a/.github/actions/workflow-setup/action.yaml +++ b/.github/actions/workflow-setup/action.yaml @@ -1,6 +1,11 @@ name: "Hyperledger Indy Workflow Setup" description: "Gets the relevant information for the workflow" +inputs: + ownerRepo: + description: The main repo of the work + default: "hyperledger" + required: false outputs: CACHE_KEY_BUILD: description: "A Hash of the Dockerfile for checking if rebuild is needed" @@ -42,8 +47,8 @@ runs: echo "::set-output name=UBUNTU_VERSION::ubuntu-2004" echo "::set-output name=distribution::focal" - # Ensure publishing is only performed when the build is executed from the main (hyperledger/indy-plenum) repository. - if [[ ${{ github.repository_owner }} == 'hyperledger' ]]; then + # Ensure publishing is only performed when the build is executed from the main organization. + if [[ ${{ github.repository_owner }} == '${{ inputs.ownerRepo }}' ]]; then echo "::set-output name=publish::true" else echo "::set-output name=publish::false" diff --git a/.github/workflows/buildpackages.yaml b/.github/workflows/buildpackages.yaml index 7ff0aa0..61bf153 100644 --- a/.github/workflows/buildpackages.yaml +++ b/.github/workflows/buildpackages.yaml @@ -38,7 +38,7 @@ jobs: - name: Set Build Version id: version - uses: hyperledger/indy-shared-gha/.github/actions/set-version@v1.0.0 + uses: hyperledger/indy-shared-gha/.github/actions/set-version@v1 with: moduleName: ${{ inputs.moduleName }} isDev: ${{ inputs.isDev }} @@ -87,7 +87,7 @@ jobs: - name: Set Build Version id: version - uses: hyperledger/indy-shared-gha/.github/actions/set-version@v1.0.0 + uses: hyperledger/indy-shared-gha/.github/actions/set-version@v1 with: moduleName: ${{ inputs.moduleName }} isDev: ${{ inputs.isDev }} diff --git a/.github/workflows/publish_artifacts.yaml b/.github/workflows/publish_artifacts.yaml index 88d3583..27ce8e6 100644 --- a/.github/workflows/publish_artifacts.yaml +++ b/.github/workflows/publish_artifacts.yaml @@ -52,7 +52,7 @@ jobs: path: to_publish - name: Publish Artifacts - uses: hyperledger/indy-shared-gha/.github/actions/publish-deb@v1.0.0 + uses: hyperledger/indy-shared-gha/.github/actions/publish-deb@v1 with: sourceDirectory: ./to_publish distribution: ${{ inputs.distribution }} @@ -65,7 +65,7 @@ jobs: path: ./third-party-dependencies_to_publish - name: Publish 3rd Party Dependencies - uses: hyperledger/indy-shared-gha/.github/actions/publish-deb@v1.0.0 + uses: hyperledger/indy-shared-gha/.github/actions/publish-deb@v1 with: sourceDirectory: ./third-party-dependencies_to_publish distribution: ${{ inputs.distribution }}