Merge pull request cri-o#4652 from haircommander/gh-actions-2-1.20

openshift-merge-robot · web-flow · commit 0e6266bc8b26 · 2021-03-12T13:17:26.000-05:00
[1.20] update github actions again
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -19,7 +19,7 @@ jobs:
           path: |
             ~/go/pkg/mod
             ~/.cache/go-build
-          key: go-build-${{ hashFiles('**/go.sum') }}
+          key: go-integration-${{ hashFiles('**/go.sum') }}
           restore-keys: go-integration-
       - run: scripts/github-actions-packages
       - run: scripts/github-actions-setup
@@ -41,7 +41,7 @@ jobs:
           path: |
             ~/go/pkg/mod
             ~/.cache/go-build
-          key: go-build-${{ hashFiles('**/go.sum') }}
+          key: go-integration-${{ hashFiles('**/go.sum') }}
           restore-keys: go-integration-
       - run: scripts/github-actions-packages
       - run: scripts/github-actions-setup
@@ -62,7 +62,7 @@ jobs:
           path: |
             ~/go/pkg/mod
             ~/.cache/go-build
-          key: go-build-${{ hashFiles('**/go.sum') }}
+          key: go-integration-${{ hashFiles('**/go.sum') }}
           restore-keys: go-integration-
       - run: scripts/github-actions-packages
       - run: scripts/github-actions-setup
@@ -86,7 +86,7 @@ jobs:
           path: |
             ~/go/pkg/mod
             ~/.cache/go-build
-          key: go-build-${{ hashFiles('**/go.sum') }}
+          key: go-integration-${{ hashFiles('**/go.sum') }}
           restore-keys: go-integration-
       - run: scripts/github-actions-packages
       - run: scripts/github-actions-setup
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -232,7 +232,7 @@ jobs:
       - run: make codecov
 
   release-notes:
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/master' || contains(github.ref, 'refs/heads/release')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -256,7 +256,7 @@ jobs:
           if-no-files-found: ignore
 
   dependencies:
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/master' || contains(github.ref, 'refs/heads/release')
     needs: release-notes
     runs-on: ubuntu-latest
     steps:
diff --git a/scripts/github-actions-packages b/scripts/github-actions-packages
@@ -6,6 +6,7 @@ sudo apt install -y \
     conntrack \
     libaio-dev \
     libapparmor-dev \
+    libbtrfs-dev \
     libcap-dev \
     libdevmapper-dev \
     libfuse-dev \
