Merge commit '30275cd80e8552d6cbcdeb11f83a4d5028aa6eae' into glitch-soc/merge-upstream
This commit is contained in:
commit
b5c1a13341
75 files changed
+1032
-267
No files matched your search
@@ -31,7 +31,7 @@ jobs:
|
||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||
|
||||
- name: Set up Ruby
|
||||
uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 # v1
|
||||
uses: ruby/setup-ruby@c984c1a20bb35a1cbda04477c816cea024418be9 # v1
|
||||
with:
|
||||
bundler-cache: true
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ jobs:
|
||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||
|
||||
- name: Set up Ruby
|
||||
uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 # v1
|
||||
uses: ruby/setup-ruby@c984c1a20bb35a1cbda04477c816cea024418be9 # v1
|
||||
with:
|
||||
bundler-cache: true
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ jobs:
|
||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||
|
||||
- name: Set up Ruby
|
||||
uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 # v1
|
||||
uses: ruby/setup-ruby@c984c1a20bb35a1cbda04477c816cea024418be9 # v1
|
||||
with:
|
||||
bundler-cache: true
|
||||
|
||||
|
||||
@@ -125,6 +125,7 @@ jobs:
|
||||
matrix:
|
||||
ruby-version:
|
||||
- '3.3'
|
||||
- '3.4'
|
||||
- '.ruby-version'
|
||||
steps:
|
||||
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
|
||||
@@ -217,6 +218,7 @@ jobs:
|
||||
matrix:
|
||||
ruby-version:
|
||||
- '3.3'
|
||||
- '3.4'
|
||||
- '.ruby-version'
|
||||
|
||||
steps:
|
||||
@@ -347,6 +349,7 @@ jobs:
|
||||
matrix:
|
||||
ruby-version:
|
||||
- '3.3'
|
||||
- '3.4'
|
||||
- '.ruby-version'
|
||||
search-image:
|
||||
- docker.elastic.co/elasticsearch/elasticsearch:7.17.29
|
||||
|
||||
Reference in new issue
Block a user