Merge branch 'release/v2021-04-28' (PR #2633)

cardano-foundation · May 4, 2021 · b80e5a0 · b80e5a0
2 parents 9101a8e + 8b57b53
commit b80e5a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   release:
-    if: ${{ startsWith(github.ref, 'refs/tags/v')  }}
+    if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/release/v') }}
     runs-on: ubuntu-20.04
     steps:
       - name: '❄ Wait for Hydra build'
@@ -31,6 +31,8 @@ jobs:
           files: |
             *.tar.gz
             *.zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   docs:
     runs-on: ubuntu-20.04
@@ -55,6 +57,8 @@ jobs:
           enable_jekyll: false
           publish_dir: _build
           keep_files: true
+          user_name: 'William King Noel Bot'
+          user_email: 'adrestia@iohk.io'
 
   bump_sh:
     if: startsWith(github.ref, 'refs/tags/v')

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -8,6 +8,7 @@ on:
       - master
       - bors/staging
       - bors/trying
+      - 'release/v*'
   pull_request:
 
 jobs:
@@ -88,7 +89,7 @@ jobs:
   cardano-wallet-test-integration:
     name: 'cardano-wallet:integration'
     needs: setup
-    if: startsWith(github.ref, 'refs/heads/bors/')
+    if: ${{ startsWith(github.ref, 'refs/heads/bors/') || startsWith(github.ref, 'refs/heads/release/v') }}
     runs-on: windows-2016
     steps:
       - uses: actions/download-artifact@v2