Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update puma #2390

Merged
merged 2 commits into from
Sep 5, 2023
Merged

Update puma #2390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea970b6
update puma
sethherr Sep 5, 2023
0c0d8f9
bump cache
sethherr Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# To bump cache:
# Increment & Replace: 'CACHE_V3' in this config
# Increment & Replace: 'CACHE_V4' in this config

# NB: It would be great to use Pipeline parameters instead of search and replacing the cache key
# ... but that doesn't work with this config version, and workflows don't work with version 2.1
Expand Down Expand Up @@ -68,8 +68,8 @@ jobs:
- restore_cache:
name: "Dockerize: cache restore"
keys:
- CACHE_V3-dockerize-0.6.1
- CACHE_V3-dockerize-
- CACHE_V4-dockerize-0.6.1
- CACHE_V4-dockerize-

- run:
name: "Dockerize: install"
Expand All @@ -84,16 +84,16 @@ jobs:

- type: cache-save
name: "Dockerize: cache save"
key: CACHE_V3-dockerize-0.6.1
key: CACHE_V4-dockerize-0.6.1
paths:
- ~/.cache/dockerize

# Updated all restore_cache to make things more functional when changing a single dependency, see PR#2366
- restore_cache:
name: "Git: cache restore"
keys:
- CACHE_V3-git-2.22.0
- CACHE_V3-git-
- CACHE_V4-git-2.22.0
- CACHE_V4-git-

- run:
name: "Git: install"
Expand Down Expand Up @@ -128,15 +128,15 @@ jobs:

- type: cache-save
name: "Git: cache save"
key: CACHE_V3-git-2.22.0
key: CACHE_V4-git-2.22.0
paths:
- ~/.cache/git/git-2.22.0

- restore_cache:
name: "Hub: cache restore"
keys:
- CACHE_V3-hub-2.12.3
- CACHE_V3-hub-
- CACHE_V4-hub-2.12.3
- CACHE_V4-hub-

- run:
name: "Hub: install"
Expand All @@ -161,8 +161,8 @@ jobs:
- restore_cache:
name: "Hub: cache save"
keys:
- CACHE_V3-hub-2.12.3
- CACHE_V3-hub-
- CACHE_V4-hub-2.12.3
- CACHE_V4-hub-
paths:
- ~/.cache/hub

Expand All @@ -173,8 +173,8 @@ jobs:
- restore_cache:
name: "Ruby dependencies: cache restore"
keys:
- CACHE_V3-gems-{{ checksum "Gemfile.lock" }}
- CACHE_V3-gems-
- CACHE_V4-gems-{{ checksum "Gemfile.lock" }}
- CACHE_V4-gems-

- run:
name: "Ruby dependencies: install"
Expand All @@ -185,7 +185,7 @@ jobs:

- type: cache-save
name: "Ruby dependencies: cache save"
key: CACHE_V3-gems-{{ checksum "Gemfile.lock" }}
key: CACHE_V4-gems-{{ checksum "Gemfile.lock" }}
paths:
- ~/.cache/bundle

Expand All @@ -196,8 +196,8 @@ jobs:
- restore_cache:
name: "Node dependencies: cache restore"
keys:
- CACHE_V3-yarn-{{ checksum "yarn.lock" }}
- CACHE_V3-yarn-
- CACHE_V4-yarn-{{ checksum "yarn.lock" }}
- CACHE_V4-yarn-

- run:
name: "Node dependencies: install"
Expand All @@ -208,15 +208,15 @@ jobs:

- type: cache-save
name: "Node dependencies: cache save"
key: CACHE_V3-yarn-{{ checksum "yarn.lock" }}
key: CACHE_V4-yarn-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn

- restore_cache:
name: "Assets: cache restore"
keys:
- CACHE_V3-assets-{{ .Environment.CIRCLE_SHA1 }}
- CACHE_V3-assets-
- CACHE_V4-assets-{{ .Environment.CIRCLE_SHA1 }}
- CACHE_V4-assets-

- run:
name: "Assets: precompile"
Expand All @@ -228,7 +228,7 @@ jobs:

- type: cache-save
name: "Assets: cache save"
key: CACHE_V3-assets-{{ .Environment.CIRCLE_SHA1 }}
key: CACHE_V4-assets-{{ .Environment.CIRCLE_SHA1 }}
paths:
- .sass-cache
- public/assets
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,13 +427,13 @@ GEM
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.3.0)
mustermann (1.1.1)
mustermann (1.1.2)
ruby2_keywords (~> 0.0.1)
mustermann-grape (1.0.1)
mustermann (>= 1.0.0)
naught (1.1.0)
nenv (0.3.0)
nio4r (2.5.8)
nio4r (2.5.9)
nokogiri (1.15.3)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
Expand Down Expand Up @@ -504,7 +504,7 @@ GEM
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.6)
puma (5.6.4)
puma (6.3.1)
nio4r (~> 2.0)
racc (1.7.1)
rack (2.2.3)
Expand Down