Browse Source

Merge pull request #2211 from gravitl/GRA-1532-release-workflow

Gra 1532 release workflow
dcarns 2 years ago
parent
commit
576198bdac
2 changed files with 10 additions and 4 deletions
  1. 4 4
      .github/workflows/publish-docker.yml
  2. 6 0
      .github/workflows/release.yml

+ 4 - 4
.github/workflows/publish-docker.yml

@@ -19,8 +19,8 @@ jobs:
       -
       -
         name: Set tag
         name: Set tag
         run: |
         run: |
-            if [[ -n "${{ github.event.inputs.tag }}" ]]; then
-              TAG=${{ github.event.inputs.tag }}
+            if [[ -n "${{ inputs.tag }}" ]]; then
+              TAG=${{ inputs.tag }}
             elif [[ "${{ github.ref_name }}" == 'master' ]]; then
             elif [[ "${{ github.ref_name }}" == 'master' ]]; then
               TAG="latest"
               TAG="latest"
             else
             else
@@ -59,8 +59,8 @@ jobs:
       -
       -
         name: Set tag
         name: Set tag
         run: |
         run: |
-            if [[ -n "${{ github.event.inputs.tag }}" ]]; then
-              TAG=${{ github.event.inputs.tag }}
+            if [[ -n "${{ inputs.tag }}" ]]; then
+              TAG=${{ inputs.tag }}
             elif [[ "${{ github.ref_name }}" == 'master' ]]; then
             elif [[ "${{ github.ref_name }}" == 'master' ]]; then
               TAG="latest"
               TAG="latest"
             else
             else

+ 6 - 0
.github/workflows/release.yml

@@ -20,6 +20,8 @@ jobs:
     uses: ./.github/workflows/release-branch.yml
     uses: ./.github/workflows/release-branch.yml
     with:
     with:
       version: ${{ github.event.inputs.version }}
       version: ${{ github.event.inputs.version }}
+    secrets: inherit
+
   
   
   release-assets:
   release-assets:
     needs: release-branch
     needs: release-branch
@@ -27,12 +29,14 @@ jobs:
     with:
     with:
       version: ${{ github.event.inputs.version }}
       version: ${{ github.event.inputs.version }}
       prerelease: ${{ github.event.inputs.prerelease == 'true' }}
       prerelease: ${{ github.event.inputs.prerelease == 'true' }}
+    secrets: inherit
 
 
   docker:
   docker:
     needs: release-branch
     needs: release-branch
     uses: ./.github/workflows/publish-docker.yml
     uses: ./.github/workflows/publish-docker.yml
     with:
     with:
       tag: ${{ github.event.inputs.version }}
       tag: ${{ github.event.inputs.version }}
+    secrets: inherit
 
 
   packages:
   packages:
     if: ${{ github.event.inputs.prerelease == 'false' }}
     if: ${{ github.event.inputs.prerelease == 'false' }}
@@ -40,6 +44,7 @@ jobs:
     uses: ./.github/workflows/packages.yml
     uses: ./.github/workflows/packages.yml
     with:
     with:
       version: ${{ github.event.inputs.version }}
       version: ${{ github.event.inputs.version }}
+    secrets: inherit
 
 
   pull-request:
   pull-request:
     if: ${{ github.event.inputs.prerelease == 'false' }}
     if: ${{ github.event.inputs.prerelease == 'false' }}
@@ -47,3 +52,4 @@ jobs:
     uses: ./.github/workflows/pull-request.yml
     uses: ./.github/workflows/pull-request.yml
     with:
     with:
       version: ${{ github.event.inputs.version }}
       version: ${{ github.event.inputs.version }}
+    secrets: inherit