Merge remote-tracking branch 'github/pull/613'

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index cb55b9b996c655d4ffa47081efba91dbd0f0cb0a..1e0f4432284ffe3a26e1a100908a0f99cf11cd07 100644 (file)
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -129,7 +129,7 @@ jobs:
       fail-fast: false
     steps:
     - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         registry: ghcr.io
         username: ${{ github.actor }}

diff --git a/cookbooks/civicrm/attributes/default.rb b/cookbooks/civicrm/attributes/default.rb
index a0515a60c701ac9d935333a4cf54c1c35e868133..11f376b07b62a63bca7280f698358f21194d5dfe 100644 (file)
--- a/cookbooks/civicrm/attributes/default.rb
+++ b/cookbooks/civicrm/attributes/default.rb
@@ -62,4 +62,4 @@ default[:civicrm][:extensions][:sweetalert][:revision] = "1.5"
 # Stripe requires firewall
 default[:civicrm][:extensions][:firewall][:name] = "org.civicrm.firewall"
 default[:civicrm][:extensions][:firewall][:repository] = "https://lab.civicrm.org/extensions/firewall.git"
-default[:civicrm][:extensions][:firewall][:revision] = "1.5.9"
\ No newline at end of file
+default[:civicrm][:extensions][:firewall][:revision] = "1.5.9"