Merge pull request #574 from Shopify/update-dev-env

Update dependencies and dev environment

.github/workflows/ci.yml

@@ -19,11 +19,11 @@ jobs:
             ruby: '3.0'
             gemfile: "Gemfile.min-supported"
           - name: 'Latest released & run rubocop'
-            ruby: '3.2'
+            ruby: '3.3'
             gemfile: "Gemfile.latest-release"
             rubocop: true
           - name: 'Rails edge'
-            ruby: '3.2'
+            ruby: '3.3'
             gemfile: "Gemfile.rails-edge"
             edge: true
 
@@ -69,25 +69,26 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get -y install libmemcached-dev libmysqlclient-dev libpq-dev libsasl2-dev
+
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.entry.ruby }}
-    - name: Install bundler and gems
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
+        bundler-cache: true
+
     - name: Test with mysql
       env:
         DB: mysql2
       run: bundle exec rake test
+
     - name: Test with postgres and memcached_store
       env:
         DB: postgresql
         POSTGRES_PASSWORD: postgres
         ADAPTER: memcached
       run: bundle exec rake test
+
     - name: Run rubocop
       if: matrix.entry.rubocop
       run: bundle exec rubocop

.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.4

Gemfile

@@ -9,7 +9,7 @@ gem "rubocop-shopify", "~> 2.9.0", require: false
 
 gem "mysql2", "~> 0.5.3", platform: :mri
 gem "pg", ">= 0.18", "< 2.0", platform: :mri
-gem "memcached", "~> 1.8.0", platform: :mri
+gem "memcached", github: "Shopify/memcached", branch: "1-0-stable-shopify", platform: :mri
 gem "memcached_store", "~> 2.3.2", platform: :mri
 gem "dalli", "~> 3.2.3"
 gem "cityhash", "~> 0.6.0", platform: :mri

Gemfile.lock

@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/Shopify/memcached.git
+  revision: 54a89bae698896a00fd2ceeb142dada6285f73ed
+  branch: 1-0-stable-shopify
+  specs:
+    memcached (1.9.0)
+
 PATH
   remote: .
   specs:
@@ -8,45 +15,45 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.3.2)
-      activesupport (= 7.1.3.2)
-    activerecord (7.1.3.2)
-      activemodel (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activemodel (7.2.0)
+      activesupport (= 7.2.0)
+    activerecord (7.2.0)
+      activemodel (= 7.2.0)
+      activesupport (= 7.2.0)
       timeout (>= 0.4.0)
-    activesupport (7.1.3.2)
+    activesupport (7.2.0)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     ar_transaction_changes (1.1.9)
       activerecord (>= 5.2.0)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.8)
     byebug (11.1.3)
     cityhash (0.6.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     dalli (3.2.3)
     drb (2.2.1)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     json (2.7.1)
     language_server-protocol (3.17.0.3)
-    memcached (1.8.0)
+    logger (1.6.0)
     memcached_store (2.3.4)
       activesupport (>= 6)
       memcached (~> 1.8)
-    minitest (5.22.2)
+    minitest (5.25.1)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
-    mutex_m (0.2.0)
     mysql2 (0.5.6)
     parallel (1.24.0)
     parser (3.3.0.5)
@@ -76,6 +83,7 @@ GEM
       rubocop (~> 1.33)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
+    securerandom (0.3.1)
     spy (1.0.5)
     stackprof (0.2.26)
     strscan (3.1.0)
@@ -94,7 +102,7 @@ DEPENDENCIES
   cityhash (~> 0.6.0)
   dalli (~> 3.2.3)
   identity_cache!
-  memcached (~> 1.8.0)
+  memcached!
   memcached_store (~> 2.3.2)
   minitest (~> 5.14)
   mocha (~> 2.0)

dev.yml

@@ -1,18 +1,10 @@
 name: identity-cache
 
 up:
-  - homebrew:
-    - [email protected]:
-        or:        [[email protected]]
-        conflicts: [mysql-connector-c, mysql, mysql-client]
   - ruby
-  - isogun
   - bundler
-
-env:
-  RAILGUN_HOST: identity-cache.railgun
-  MYSQL_HOST: identity-cache.railgun
-  MEMCACHED_HOST: identity-cache.railgun
+  - memcached
+  - mysql
 
 commands:
   test:

gemfiles/Gemfile.latest-release

@@ -8,6 +8,7 @@ gem "activerecord"
 gem "activesupport"
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
+gem "memcached", github: "Shopify/memcached", branch: "1-0-stable-shopify"
 gem "memcached_store"
 gem "dalli"
 gem "cityhash"

gemfiles/Gemfile.min-supported

@@ -6,7 +6,7 @@ gem "ar_transaction_changes", "~> 1.1.0"
 gem "activerecord", "~> 7.0.0"
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
-gem "memcached", "~> 1.8.0"
+gem "memcached", github: "Shopify/memcached", branch: "1-0-stable-shopify"
 gem "memcached_store", "~> 2.3.2"
 gem "dalli", "~> 2.7.11"
 gem "cityhash", "~> 0.6.0"

gemfiles/Gemfile.rails-edge

@@ -5,6 +5,7 @@ gem "activerecord", github: "rails/rails", branch: "main"
 gem "activesupport", github: "rails/rails", branch: "main"
 gem "mysql2", "~> 0.5"
 gem "pg", "~> 1.1"
+gem "memcached", github: "Shopify/memcached", branch: "1-0-stable-shopify"
 gem "memcached_store"
 gem "dalli"
 gem "cityhash"