Merge pull request #1759 from pSchlarb/GHARefactoring

consistent GHA variable substitution
hyperledger · Jun 3, 2022 · 57d132f · 57d132f
2 parents 59bb3a9 + b0a0b18
commit 57d132f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 22 deletions.
diff --git a/.github/workflows/PR.yaml b/.github/workflows/PR.yaml
@@ -7,7 +7,6 @@ on:
 
     branches:
       - ubuntu-20.04-upgrade
-
   workflow_dispatch:
 
 jobs:
@@ -54,7 +53,7 @@ jobs:
     uses: hyperledger/indy-shared-gha/.github/workflows/buildimage.yaml@v1
     with:
       CACHE_KEY_BUILD: ${{ needs.workflow-setup.outputs.CACHE_KEY_BUILD }}
-      DOCKER_IMAGE: ghcr.io/${{  needs.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}/node-build
+      DOCKER_IMAGE: ghcr.io/${{ needs.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}/node-build
       UBUNTU_VERSION: ${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}
 
   indy_node_tests:
@@ -70,7 +69,7 @@ jobs:
     needs: [workflow-setup, indy_node_tests]
     uses: hyperledger/indy-shared-gha/.github/workflows/buildpackages.yaml@v1
     with:
-      DOCKER_IMAGE: ghcr.io/${{  needs.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}/node-build:${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}
+      DOCKER_IMAGE: ghcr.io/${{ needs.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}/node-build:${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}
       UBUNTU_VERSION: ${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}
       isDev: true
       isRC: false

diff --git a/.github/workflows/Push.yaml b/.github/workflows/Push.yaml
@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - ubuntu-20.04-upgrade
-      - feature/did-indy*
     paths:
       - '**.py'
       - '.github/**'
@@ -41,7 +40,7 @@ jobs:
     uses: hyperledger/indy-shared-gha/.github/workflows/buildimage.yaml@v1
     with:
       CACHE_KEY_BUILD: ${{ needs.workflow-setup.outputs.CACHE_KEY_BUILD }}
-      DOCKER_IMAGE: ghcr.io/${{  needs.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}/node-build
+      DOCKER_IMAGE: ghcr.io/${{ needs.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}/node-build
       UBUNTU_VERSION: ${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}
 
   indy_node_tests:
@@ -57,7 +56,7 @@ jobs:
     needs: [workflow-setup, indy_node_tests]
     uses: hyperledger/indy-shared-gha/.github/workflows/buildpackages.yaml@v1
     with:
-      DOCKER_IMAGE: ghcr.io/${{  needs.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}/node-build:${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}
+      DOCKER_IMAGE: ghcr.io/${{ needs.workflow-setup.outputs.GITHUB_REPOSITORY_NAME }}/node-build:${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}
       UBUNTU_VERSION: ${{ needs.workflow-setup.outputs.UBUNTU_VERSION }}
       isDev: true
       isRC: false

diff --git a/.github/workflows/WIPupdatePlenumDependency b/.github/workflows/WIPupdatePlenumDependency
@@ -14,8 +14,8 @@
 #       version: ${{ steps.get-release-info.outputs.version }}
 #       isPreRelease: ${{ steps.get-release-info.outputs.isRC }}
 #       Branch: ${{ steps.setPRBranch.outputs.prBranch }}
-#       BASE: ${{ steps.branch.outputs.BASE}}
-#       nodeVersion: ${{ steps.nodeVersion.outputs.nodeVersion}}
+#       BASE: ${{ steps.branch.outputs.BASE }}
+#       nodeVersion: ${{ steps.nodeVersion.outputs.nodeVersion }}
 #     steps:
 #       - name: checkout source code
 #         uses: actions/checkout@v3
@@ -70,14 +70,14 @@
 #           token: ${{ secrets.BOT_PR_PAT }}
 #       - name: Update Setup.py
 #         run: |
-#           sed -E -i 's/indy-plenum==[[:digit:]]+.[[:digit:]]+.[[:digit:]]+(.(dev|rc)[[:digit:]]+)?/indy-plenum==${{needs.taginfos.outputs.version}}/g' setup.py
+#           sed -E -i 's/indy-plenum==[[:digit:]]+.[[:digit:]]+.[[:digit:]]+(.(dev|rc)[[:digit:]]+)?/indy-plenum==${{ needs.taginfos.outputs.version }}/g' setup.py
 #       - name: CommitAndTag
 #         uses: EndBug/add-and-commit@v9
 #         with:
 #           author_name: ${{ github.actor }} 
 #           author_email: ${{ github.event.pusher.email }}
 #           commit: --signoff
-#           message: 'Update Plenum Dependency to  ${{needs.taginfos.outputs.version}}'
-#           push: "origin ${{ needs.taginfos.outputs.Branch}} --set-upstream --force"
-#           new_branch: ${{ needs.taginfos.outputs.Branch}}
-#           tag: "setRelease-v${{needs.taginfos.outputs.nodeVersion}}"
+#           message: 'Update Plenum Dependency to  ${{ needs.taginfos.outputs.version }}'
+#           push: "origin ${{ needs.taginfos.outputs.Branch }} --set-upstream --force"
+#           new_branch: ${{ needs.taginfos.outputs.Branch }}
+#           tag: "setRelease-v${{ needs.taginfos.outputs.nodeVersion }}"
diff --git a/.github/workflows/publishRelease.yaml b/.github/workflows/publishRelease.yaml
@@ -18,7 +18,7 @@ jobs:
       isVersionBump: ${{ steps.get-release-info.outputs.isVersionBump }}
       isPreRelease: ${{ steps.get-release-info.outputs.isRC }}
       versionTag: ${{ steps.get-release-info.outputs.versionTag }}
-      component: ${{ steps.get-release-info.outputs.component}}
+      component: ${{ steps.get-release-info.outputs.component }}
       CACHE_KEY_BUILD: ${{ steps.workflow-setup.outputs.CACHE_KEY_BUILD }}
       UBUNTU_VERSION: ${{ steps.workflow-setup.outputs.UBUNTU_VERSION }}
       # Expose the lowercase version of the GitHub repository name
@@ -27,7 +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}}
+      publish: ${{ steps.workflow-setup.outputs.publish }}
     steps:
       - name: checkout source code
         uses: actions/checkout@v2
@@ -52,23 +52,23 @@ jobs:
       - name: Download Node deb Artifacts from Github Action Artifacts
         uses: dawidd6/action-download-artifact@v2
         with:
-          github_token: ${{secrets.GITHUB_TOKEN}}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: releasepr.yaml
           workflow_conclusion: success
           name: indy_node-deb
           path: artifacts/indy_node-deb
       - name: Download Node python Artifacts from Github Action Artifacts
         uses: dawidd6/action-download-artifact@v2
         with:
-          github_token: ${{secrets.GITHUB_TOKEN}}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: releasepr.yaml
           workflow_conclusion: success
           name: indy_node-python
           path: artifacts/indy_node-python
       - name: Download Node third party dependency Artifacts from Github Action Artifacts
         uses: dawidd6/action-download-artifact@v2
         with:
-          github_token: ${{secrets.GITHUB_TOKEN}}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           workflow: releasepr.yaml
           workflow_conclusion: success
           name: third-party-dependencies
@@ -102,7 +102,7 @@ jobs:
           generate_release_notes: true
           body: "[${{ needs.release-infos.outputs.VERSIONTAG }}] "
           prerelease: ${{ needs.release-infos.outputs.isPreRelease }}
-          target_commitish: ${{github.event.ref}}
+          target_commitish: ${{ github.event.ref }}
           name: "${{ needs.release-infos.outputs.VERSIONTAG }}"
           token: ${{ secrets.BOT_PR_PAT }}
 

diff --git a/.github/workflows/releasepr.yaml b/.github/workflows/releasepr.yaml
@@ -46,7 +46,7 @@ jobs:
     uses: hyperledger/indy-shared-gha/.github/workflows/buildimage.yaml@v1
     with:
       CACHE_KEY_BUILD: ${{ needs.release-infos.outputs.CACHE_KEY_BUILD }}
-      DOCKER_IMAGE: ghcr.io/${{  needs.release-infos.outputs.GITHUB_REPOSITORY_NAME }}/node-build
+      DOCKER_IMAGE: ghcr.io/${{ needs.release-infos.outputs.GITHUB_REPOSITORY_NAME }}/node-build
       UBUNTU_VERSION: ${{ needs.release-infos.outputs.UBUNTU_VERSION }}
 
 
@@ -66,7 +66,7 @@ jobs:
     if: needs.release-infos.outputs.isVersionBump == 'true'
     uses: hyperledger/indy-shared-gha/.github/workflows/buildpackages.yaml@v1
     with:
-      DOCKER_IMAGE: ghcr.io/${{  needs.release-infos.outputs.GITHUB_REPOSITORY_NAME }}/node-build:${{ needs.release-infos.outputs.UBUNTU_VERSION }}
+      DOCKER_IMAGE: ghcr.io/${{ needs.release-infos.outputs.GITHUB_REPOSITORY_NAME }}/node-build:${{ needs.release-infos.outputs.UBUNTU_VERSION }}
       UBUNTU_VERSION: ${{ needs.release-infos.outputs.UBUNTU_VERSION }}
       isDev: 'false'
       isRC: '${{ needs.release-infos.outputs.isPreRelease }}'

diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml
@@ -13,7 +13,7 @@ jobs:
       version: ${{ steps.get-release-info.outputs.version }}
       versionTag: ${{ steps.get-release-info.outputs.versionTag }}
       prBranch: ${{ steps.get-release-info.outputs.prBranch }}
-      BASE: ${{ steps.get-branch.outputs.branch}}
+      BASE: ${{ steps.get-branch.outputs.branch }}
     steps:
       - name: checkout source code
         uses: actions/checkout@v1