Merge pull request #353 from zendesk/fzhang/veg-1714/bump-4-38-2 into…

… master * fzhang/veg-1714/bump-4-38-2: Bump version to 4.38.2 Fix vendor cache path Improve Actions cache key Bump GitHub Action versions
zendesk · Mar 9, 2023 · ec48b49 · ec48b49
2 parents 24b2239 + 89d6d2c
commit ec48b49
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -13,18 +13,23 @@ jobs:
       matrix:
         ruby-version: [3.0.4, 2.7.5, 2.6.10]
     steps:
-    - uses: zendesk/checkout@v2
+    - uses: zendesk/checkout@v3
     - uses: zendesk/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
     - name: Vendor Cache
       id: vendor-cache
-      uses: zendesk/cache@v2
+      uses: zendesk/cache@v3
       with:
         path: vendor/cache
-        key: ${{ runner.os }}-vendor
+        key: ${{ runner.os }}-vendor-ruby-${{ matrix.ruby-version }}-lock-${{ hashFiles('Gemfile.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-vendor-ruby-${{ matrix.ruby-version }}-
+          ${{ runner.os }}-vendor-
     - name: before_script
-      run: bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+      run: |
+        bundle config set --local path 'vendor/cache'
+        bundle install --jobs=3 --retry=3
     - name: build
       run: |
         bundle exec rake

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zendesk_apps_support (4.38.1)
+    zendesk_apps_support (4.38.2)
       erubis
       i18n
       image_size (~> 2.0.2)

diff --git a/zendesk_apps_support.gemspec b/zendesk_apps_support.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'zendesk_apps_support'
-  s.version     = '4.38.1'
+  s.version     = '4.38.2'
   s.license     = 'Apache License Version 2.0'
   s.authors     = ['James A. Rosen', 'Likun Liu', 'Sean Caffery', 'Daniel Ribeiro']
   s.email       = ['dev@zendesk.com']