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.

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

[GOG-945] Update the workaround volume perf branch to v0.39.0 #109

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
de1f772
Skip git submodules when not necessary
byroot Aug 25, 2021
7963319
make refresh actions match
stephsachrajda Aug 5, 2022
cf8c3bb
Merge pull request #1277 from Shopify/align-refresh-endpoints
stephsachrajda Aug 8, 2022
beee24a
Add --quiet switches to checkouts
atesgoral Aug 9, 2022
f75f968
Merge pull request #1278 from Shopify/atesgoral/quiet-checkout
atesgoral Aug 9, 2022
7ec513d
Update CHANGELOG
atesgoral Aug 9, 2022
4a3cf13
Bump version
atesgoral Aug 9, 2022
01eb91c
Merge pull request #1279 from Shopify/atesgoral/release
atesgoral Aug 10, 2022
63cf99d
Bump omniauth from 1.9.1 to 1.9.2
dependabot[bot] Aug 31, 2022
18ce175
Improve API tests
byroot Sep 15, 2022
bcf8adf
Merge pull request #1283 from Shopify/api-tests-as-json
casperisfine Sep 15, 2022
1ac6936
Add lock and archive functionality to the stack update API call
mikailkarimi Sep 13, 2022
1695e86
Merge pull request #1282 from Shopify/add-lock-and-archive-in-stack-u…
xiaoxipang Sep 15, 2022
0f59d3a
Bump loofah from 2.18.0 to 2.19.1
dependabot[bot] Dec 13, 2022
48740e3
Merge pull request #1287 from Shopify/dependabot/bundler/loofah-2.19.1
casperisfine Dec 14, 2022
16b5e91
Bump rails-html-sanitizer from 1.4.3 to 1.4.4
dependabot[bot] Dec 14, 2022
fd7c32d
Merge pull request #1288 from Shopify/dependabot/bundler/rails-html-s…
casperisfine Dec 14, 2022
e6a8400
Merge pull request #1281 from Shopify/dependabot/bundler/omniauth-1.9.2
casperisfine Dec 14, 2022
0a45d04
Bump activerecord from 7.0.3.1 to 7.0.4.1
dependabot[bot] Jan 18, 2023
e03351a
Merge pull request #1290 from Shopify/dependabot/bundler/activerecord…
casperisfine Jan 20, 2023
ddf7fbd
Bump rack from 2.2.4 to 2.2.6.2
dependabot[bot] Jan 20, 2023
31705cc
Merge pull request #1293 from Shopify/dependabot/bundler/rack-2.2.6.2
casperisfine Jan 20, 2023
1fca0dd
hide the api token after 5 minutes
stephsachrajda Feb 24, 2023
fda49ac
Merge pull request #1298 from Shopify/obfuscate-api-tokens
stephsachrajda Feb 24, 2023
946263e
Bump rack from 2.2.6.2 to 2.2.6.3
dependabot[bot] Mar 9, 2023
e936e56
Merge pull request #1299 from Shopify/dependabot/bundler/rack-2.2.6.3
casperisfine Mar 9, 2023
9cbfe38
Add fetch_commit during checkout_repository
ruionweb Mar 14, 2023
d6e5116
Update test
ruionweb Mar 14, 2023
c99fb7b
Remove fetch branch
ruionweb Mar 15, 2023
bdabc65
Merge pull request #1300 from Shopify/rdj/fetch-commit
ruionweb Mar 16, 2023
658e3e7
Bump nokogiri
ruionweb Mar 16, 2023
f29c734
Merge pull request #1302 from Shopify/rdj/bump-nokogiri
ruionweb Mar 17, 2023
ef8a01d
Bump rack from 2.2.6.3 to 2.2.6.4
dependabot[bot] Mar 17, 2023
fa4ebea
Merge pull request #1303 from Shopify/dependabot/bundler/rack-2.2.6.4
casperisfine Mar 20, 2023
b050d80
Add fetch command
ruionweb Mar 22, 2023
dc985ab
Delegate fetch command
ruionweb Mar 22, 2023
afa307a
update test
ruionweb Mar 22, 2023
68220d6
Merge pull request #1305 from Shopify/rdj/fetch-command
ruionweb Mar 22, 2023
f7e8711
Bump globalid from 1.0.0 to 1.0.1 (#1294)
dependabot[bot] May 15, 2023
77aa6dc
Bump nokogiri from 1.14.2 to 1.14.4 (#1307)
dependabot[bot] May 15, 2023
0419ae9
Bump activesupport from 7.0.4.1 to 7.0.4.3 (#1301)
dependabot[bot] May 15, 2023
24dbb35
Update octokit_iterator.rb
kartiki975 May 16, 2023
5b3fc47
Merge pull request #1308 from Shopify/kartiki975-patch-1
kartiki975 May 17, 2023
40825cd
ContinuousDeliveryJob accounts for concurrent tasks
ruionweb May 31, 2023
e932100
Merge pull request #1309 from Shopify/rdj/continuous-delivery-job
ruionweb May 31, 2023
7478ea3
Bump actionpack from 7.0.4.3 to 7.0.5.1
dependabot[bot] Jun 29, 2023
0088acd
Merge pull request #1310 from Shopify/dependabot/bundler/actionpack-7…
casperisfine Jun 30, 2023
3f46c63
Change github_id on commit_deployment_statuses to bigint
pcothenet Jul 3, 2023
d7c9d3d
Merge pull request #1312 from pcothenet/pc/github_id
casperisfine Jul 4, 2023
3121ad1
Release 0.38.0
byroot Jul 4, 2023
7e7c331
Give concurrent task running a clear error message
stephsachrajda Jul 14, 2023
764f2db
Merge pull request #1313 from Shopify/give-concurrent-running-a-message
stephsachrajda Jul 14, 2023
8d9249a
Update README.md
bradenchime Aug 16, 2023
f6ac46f
Merge pull request #1315 from bradenchime/master-1
casperisfine Aug 17, 2023
524bbed
Bump activesupport from 7.0.6 to 7.0.7.2
dependabot[bot] Aug 23, 2023
bed1cd7
Update mocha
byroot Aug 30, 2023
195d41e
Test against Ruby 3.2
byroot Aug 30, 2023
3ff9486
Merge pull request #1316 from Shopify/dependabot/bundler/activesuppor…
casperisfine Aug 30, 2023
d00926c
Update stack.rb
kartiki975 Sep 7, 2023
3e71f78
Rename test file
kartiki975 Sep 7, 2023
a8383d7
Update stack_test.rb
kartiki975 Sep 7, 2023
eed362c
Merge pull request #1317 from Shopify/bug_fix/bypass_max_commits_conf…
kartiki975 Sep 8, 2023
6c5983a
added support for config files nested in .shipit/
derek-watson Sep 13, 2023
eebb54d
Improve config file order
byroot Sep 13, 2023
2181e07
Merge pull request #1318 from Shopify/dot-shipit-config
casperisfine Sep 13, 2023
7f5bce4
Update `master` to `main`
kartiki975 Oct 5, 2023
0400cd0
maybe these changes are not supposed to be made
kartiki975 Oct 5, 2023
28907e8
Merge pull request #1319 from Shopify/update-master-to-main
kartiki975 Oct 6, 2023
8226796
Allow overrides for default task values via URL parameters
kovyrin Dec 14, 2023
4b5ac2b
Update app/views/shipit/_variables.html.erb
kovyrin Dec 14, 2023
d9785f7
Allow override in the view
kovyrin Dec 14, 2023
7018749
Merge pull request #1320 from Shopify/kovyrin/task-var-override
kovyrin Dec 14, 2023
9607b86
Update dev.yml
kartiki975 Jan 18, 2024
402eb77
Rails 7.1.1 upgrade
kartiki975 Jan 18, 2024
1e5831b
wip
kartiki975 Jan 19, 2024
ff98ab8
Update Gemfile.lock
kartiki975 Jan 26, 2024
7508542
Update application.rb
kartiki975 Jan 23, 2024
6dcb970
Update merge_request_test.rb
kartiki975 Jan 24, 2024
af3c043
Restrict to Rails 7.1.1
kartiki975 Jan 23, 2024
1214962
Update Gemfile.lock
kartiki975 Jan 26, 2024
ba2c64a
Fix failing setup ruby 2.7 step in some Github Actions
kartiki975 Jan 26, 2024
4f72bee
Remove mini_racer gem
kartiki975 Jan 26, 2024
5329c4f
Revert "Restrict to Rails 7.1.1"
kartiki975 Jan 26, 2024
c1f65c4
Update Gemfile.lock
kartiki975 Jan 26, 2024
5550402
Add minor tweaks
kartiki975 Jan 26, 2024
03a10e9
Merge pull request #1324 from Shopify/only-upgrade-rails
kartiki975 Jan 26, 2024
d7200a0
Bump Octokit to 5.6.1
ruionweb Feb 5, 2024
8d386d0
Remove accept header
ruionweb Feb 5, 2024
52159ae
Merge pull request #1327 from Shopify/rdj/octokit-bump
ruionweb Feb 7, 2024
9034b7b
Create secrets.development.json
kartiki975 Jan 22, 2024
d5cf443
Merge pull request #1326 from Shopify/remove-deprecation-warning
kartiki975 Feb 7, 2024
cda4789
rescue forbidden user github error
erik-shopify Mar 6, 2024
0834c0b
Merge pull request #1332 from Shopify/erik/forbidden-user
casperisfine Mar 7, 2024
c2c77ea
Stack: update `build_deploy` to pass `allow_concurrency`
kartiki975 Mar 19, 2024
261b3ad
Merge pull request #1334 from Shopify/update-deploy-api
kartiki975 Mar 20, 2024
57a05ef
Bump rdoc from 6.6.2 to 6.6.3.1
dependabot[bot] Mar 25, 2024
f7ec2fb
Merge pull request #1335 from Shopify/dependabot/bundler/rdoc-6.6.3.1
erik-shopify Mar 26, 2024
37cface
Bump rack from 2.2.8 to 2.2.9
dependabot[bot] Mar 26, 2024
f2207dd
Merge pull request #1337 from Shopify/dependabot/bundler/rack-2.2.9
erik-shopify Mar 26, 2024
047dbab
Release 0.39.0
byroot Apr 3, 2024
62297f0
Merge pull request #1338 from Shopify/release-0.39.0
casperisfine Apr 3, 2024
c200e30
Set .ruby-version to 3.0.3
jenshenny Apr 9, 2024
69e3eb9
Set required_ruby_version to >= 3.0.0
jenshenny Apr 9, 2024
42c242c
Remove ruby version definition in CI/CD
jenshenny Apr 9, 2024
a08f499
Merge pull request #1339 from Shopify/centralize_ruby_version
casperisfine Apr 9, 2024
c62f05b
Make RefreshCheckRunsJob and RefreshStatusesJob enqueue one of themse…
kwboyd-shopify Apr 11, 2024
98d1f3a
Merge pull request #1341 from Shopify/kwb/split-check-runs-and-status…
kwboyd-shopify Apr 12, 2024
891d341
Revert "Make RefreshCheckRunsJob and RefreshStatusesJob enqueue one o…
kwboyd-shopify Apr 17, 2024
2a4b7f0
Merge pull request #1343 from Shopify/revert-1341-kwb/split-check-run…
kwboyd-shopify Apr 17, 2024
ee4bab3
add github secondary rate limit retries
erik-shopify Apr 17, 2024
c945b99
Merge pull request #1344 from Shopify/kwbeqr/retry
erik-shopify Apr 17, 2024
139b1c3
Convert retry-after header string to seconds
ruionweb Apr 18, 2024
8c35118
Merge pull request #1345 from Shopify/rdj/convert-wait-string-to_i
ruionweb Apr 18, 2024
8c7a4e4
Paginate check runs refresh
sjagoe Jan 29, 2024
e18a10a
Round the `finished in` second count
DazWorrall May 20, 2024
aa1e524
Merge pull request #1350 from Shopify/round-finished-at
DazWorrall May 24, 2024
3623994
Fix tests for paginate check runs refresh
solojavier May 27, 2024
30d7c84
Merge pull request #1213 from Shopify/git-recursive-temp
casperisfine May 28, 2024
1b47ddb
Merge pull request #1325 from sjagoe/paginate-check-runs-refresh
casperisfine May 28, 2024
5ff2c97
Bump the bundler group across 1 directory with 5 updates
dependabot[bot] Jun 4, 2024
4a79775
Merge pull request #1352 from Shopify/dependabot/bundler/bundler-5e4d…
casperisfine Jun 5, 2024
c4b5f7b
Retry on Octokit::ServerError
kartiki975 Jul 19, 2024
8448ab9
Merge pull request #1353 from Shopify/retry-background-jobs
kartiki975 Jul 22, 2024
ea72ec6
Update README.md with more detailed timeout information
kwboyd-shopify Jul 22, 2024
2c4aec5
Merge pull request #1354 from Shopify/kwboyd-shopify-patch-1
kwboyd-shopify Jul 22, 2024
8a29123
Merge branch 'main' into 20240518-v0.39.0-workaround-volume-perf
mfilipe Jul 23, 2024
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
14 changes: 6 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Set up Ruby 2.7
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
bundler-cache: true
- name: rubocop
run: |
Expand All @@ -25,7 +24,7 @@ jobs:
fail-fast: false
matrix:
ruby_version:
- '2.7'
- '3.0'

services:
db:
Expand Down Expand Up @@ -68,7 +67,7 @@ jobs:
fail-fast: false
matrix:
ruby_version:
- '2.7'
- '3.0'

services:
db:
Expand Down Expand Up @@ -107,9 +106,10 @@ jobs:
fail-fast: false
matrix:
ruby_version:
- '2.7'
- '3.0'
- '3.1'
- '3.2'
- '3.3'

services:
redis:
Expand Down Expand Up @@ -139,8 +139,6 @@ jobs:
- uses: actions/checkout@v1
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0'
- name: Run setup script
run: |
git config --global user.email "[email protected]"
Expand All @@ -149,7 +147,7 @@ jobs:
export SHIPIT_GEM_PATH="${PWD}"
mkdir /tmp/new-app
cd /tmp/new-app
gem install rails -v '~> 7.0.2' --no-document
gem install rails -v '~> 7.1.1' --no-document
rails new shipit --skip-action-cable --skip-turbolinks --skip-action-mailer --skip-active-storage --skip-webpack-install --skip-action-mailbox --skip-action-text -m "${SHIPIT_GEM_PATH}/template.rb"
env:
SHIPIT_EDGE: "1"
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: 3.0
Exclude:
- tmp/*
- bin/*
Expand Down
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0.3
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
# Unreleased

# 0.39.0

* Minimum Ruby version is now Ruby 3.0
* Upgraded to Rails 7.1.1
* Upgraded Octokit to 5.6.1 (#1327)
* Migrate from legacy Rails secrets to credentials (#1326)
* Rails secrets were [deprecated in Rails 7.1](https://github.com/rails/rails/pull/48472)
* [Guide on credentials](https://guides.rubyonrails.org/security.html#custom-credentials)
* For deployments, `allow_concurrency` defaults to the same value as `force`. If wanted, it can be set separately by passing the intended value for `allow_concurrency` to `build_deploy` method

# 0.38.0

* Convert `commit_deployment_statuses.github_id` to bigint (#1312)
* Allow to lock and archive stacks from the API (#1282)
* Hide API tokens from the user interface after the initial creation (#1298)

# 0.37.0

* Suppress progress output for git checkout (#1278)
* Make API refresh action match non-API refresh action for stacks (#1277)

# 0.36.1

* Fix compatibility with Rails 7.0.3.1 (YAML serialized fields). (#1273)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ source 'https://rubygems.org'
gemspec

gem 'sqlite3'
gem 'ejson-rails', require: 'ejson/rails/skip_secrets'

group :ci do
gem 'mysql2'
Expand All @@ -25,5 +26,4 @@ end
group :development, :test do
gem 'byebug'
gem 'pry'
gem 'mini_racer'
end
Loading
Loading