From 12ae5d7efdf5fbcf20c285c5435bf372d9486c29 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Fri, 10 Nov 2023 11:18:34 +0100 Subject: [PATCH] feat(compute01/ds-fr): Update to latest version --- machines/compute01/ds-fr/package/default.nix | 6 +- .../compute01/ds-fr/package/rubyEnv/Gemfile | 3 + .../ds-fr/package/rubyEnv/Gemfile.lock | 74 +++++---- .../ds-fr/package/rubyEnv/gemset.nix | 153 +++++++++++------- machines/compute01/ds-fr/package/update.sh | 18 ++- 5 files changed, 164 insertions(+), 90 deletions(-) diff --git a/machines/compute01/ds-fr/package/default.nix b/machines/compute01/ds-fr/package/default.nix index c388bbc..060cb13 100644 --- a/machines/compute01/ds-fr/package/default.nix +++ b/machines/compute01/ds-fr/package/default.nix @@ -4,13 +4,13 @@ let pname = "ds-fr"; - version = "2023-10-02-01"; + version = "2023-11-10-01"; src = fetchFromGitHub { owner = "demarches-simplifiees"; repo = "demarches-simplifiees.fr"; rev = version; - hash = "sha256-Gh8tUSX8YeSZKIm+e2IdA1NVxd8uSgM2SPhxMNfLROE="; + hash = "sha256-NRCHISV2EE5sePvVTZfxCJVt7+SgEyMQu/fNDWoLhkk="; }; rubyEnv = bundlerEnv { @@ -37,7 +37,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-tLBkv0XWGHqgb+z896T6/xNfk9PEw/cNhuDTva6s340="; + hash = "sha256-/CI6LHI2I0BinrDduN0NNfBSGDynz0lQuySdFaWGaOo="; }; buildInputs = [ rubyEnv ]; diff --git a/machines/compute01/ds-fr/package/rubyEnv/Gemfile b/machines/compute01/ds-fr/package/rubyEnv/Gemfile index f280c31..32f699d 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/Gemfile +++ b/machines/compute01/ds-fr/package/rubyEnv/Gemfile @@ -12,6 +12,7 @@ gem 'addressable' gem 'administrate' gem 'administrate-field-enum' # Allow using Field::Enum in administrate gem 'after_party' +gem 'ancestry' gem 'anchored' gem 'bcrypt' gem 'bootsnap', '>= 1.4.4', require: false # Reduces boot times through caching; required in config/boot.rb @@ -58,6 +59,7 @@ gem 'listen' # Required by ActiveSupport::EventedFileUpdateChecker gem 'lograge' gem 'logstash-event' gem 'mailjet', require: false +gem 'maintenance_tasks' gem 'matrix' # needed by prawn and not default in ruby 3.1 gem 'mini_magick' gem 'net-imap', require: false # See https://github.com/mikel/mail/pull/1439 @@ -84,6 +86,7 @@ gem 'sentry-delayed_job' gem 'sentry-rails' gem 'sentry-ruby' gem 'sib-api-v3-sdk' +gem 'sidekiq' gem 'skylight' gem 'spreadsheet_architect' gem 'strong_migrations' # lint database migrations diff --git a/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock b/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock index a8ba102..78c32ca 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock +++ b/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock @@ -86,7 +86,7 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) administrate (0.18.0) actionpack (>= 5.0) @@ -100,16 +100,15 @@ GEM administrate (~> 0.12) aes_key_wrap (1.1.0) after_party (1.11.2) + ancestry (4.3.3) + activerecord (>= 5.2.6) anchored (1.1.0) ast (2.4.2) attr_required (1.0.1) - axe-core-api (4.2.1) - capybara + axe-core-api (4.8.0) dumb_delegator - selenium-webdriver virtus - watir - axe-core-rspec (4.2.1) + axe-core-rspec (4.8.0) axe-core-api dumb_delegator virtus @@ -120,7 +119,7 @@ GEM axlsx_styler (1.1.0) activesupport (>= 3.1) caxlsx (>= 2.0.2) - bcrypt (3.1.18) + bcrypt (3.1.19) benchmark-ips (2.12.0) better_html (1.0.16) actionview (>= 4.0) @@ -135,6 +134,7 @@ GEM bootsnap (1.9.3) msgpack (~> 1.0) brakeman (5.4.1) + brow (0.4.1) browser (5.3.1) builder (3.2.4) byebug (11.1.3) @@ -194,7 +194,7 @@ GEM sinatra (>= 1.4.4) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.9.2) + devise (4.9.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -244,15 +244,16 @@ GEM ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - flipper (0.26.0) + flipper (1.0.0) + brow (~> 0.4.1) concurrent-ruby (< 2) - flipper-active_record (0.26.0) + flipper-active_record (1.0.0) activerecord (>= 4.2, < 8) - flipper (~> 0.26.0) - flipper-ui (0.26.0) + flipper (~> 1.0.0) + flipper-ui (1.0.0) erubi (>= 1.0.0, < 2.0.0) - flipper (~> 0.26.0) - rack (>= 1.4, < 3) + flipper (~> 1.0.0) + rack (>= 1.4, < 4) rack-protection (>= 1.5.3, <= 4.0.0) sanitize (< 7) fog-core (2.3.0) @@ -271,7 +272,7 @@ GEM et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.4) geo_coord (0.2.0) - geocoder (1.6.5) + geocoder (1.8.2) globalid (1.2.1) activesupport (>= 6.1) gon (6.4.0) @@ -279,7 +280,7 @@ GEM i18n (>= 0.7) multi_json request_store (>= 1.0) - graphql (2.0.15) + graphql (2.0.24) graphql-batch (0.5.1) graphql (>= 1.10, < 3) promise.rb (~> 0.7.2) @@ -349,6 +350,8 @@ GEM ruby-vips (>= 2.0.17, < 3) invisible_captcha (2.0.0) rails (>= 5.0) + job-iteration (1.4.1) + activejob (>= 5.2) jquery-rails (4.5.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -397,7 +400,7 @@ GEM railties (>= 4) request_store (~> 1.0) logstash-event (1.2.02) - loofah (2.21.3) + loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -409,6 +412,12 @@ GEM activesupport (>= 3.1.0) rack (>= 1.4.0) rest-client (>= 2.0.0) + maintenance_tasks (2.3.2) + actionpack (>= 6.0) + activejob (>= 6.0) + activerecord (>= 6.0) + job-iteration (>= 1.3.6) + railties (>= 6.0) marcel (1.0.2) matrix (0.4.2) memory_profiler (1.0.0) @@ -421,7 +430,7 @@ GEM rake mini_magick (4.11.0) mini_mime (1.1.5) - mini_portile2 (2.8.4) + mini_portile2 (2.8.5) minitest (5.20.0) msgpack (1.4.2) multi_json (1.15.0) @@ -485,7 +494,7 @@ GEM pry (>= 0.13, < 0.15) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (5.0.1) + public_suffix (5.0.3) puma (6.3.1) nio4r (~> 2.0) pundit (2.2.0) @@ -561,12 +570,12 @@ GEM redcarpet (3.6.0) redis (5.0.6) redis-client (>= 0.9.0) - redis-client (0.14.1) + redis-client (0.18.0) connection_pool regexp_parser (2.8.1) request_store (1.5.0) rack (>= 1.4) - responders (3.1.0) + responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) rest-client (2.1.0) @@ -574,7 +583,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.5) + rexml (3.2.6) rodf (1.1.1) builder (>= 3.0) dry-inflector (~> 0.1) @@ -643,7 +652,7 @@ GEM nokogiri (>= 1.6.2) rexml xmlenc (>= 0.7.1) - sanitize (6.0.2) + sanitize (6.1.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) sass (3.7.4) @@ -664,7 +673,7 @@ GEM selectize-rails (0.12.6) selenium-devtools (0.114.0) selenium-webdriver (~> 4.2) - selenium-webdriver (4.10.0) + selenium-webdriver (4.13.1) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -681,6 +690,11 @@ GEM sib-api-v3-sdk (7.4.0) json (~> 2.1, >= 2.1.0) typhoeus (~> 1.0, >= 1.0.1) + sidekiq (7.2.0) + concurrent-ruby (< 2) + connection_pool (>= 2.3.0) + rack (>= 2.2.4) + redis-client (>= 0.14.0) simple_xlsx_reader (1.0.4) nokogiri rubyzip @@ -717,7 +731,7 @@ GEM temple (0.8.2) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - thor (1.2.2) + thor (1.3.0) thread_safe (0.3.6) tilt (2.0.11) timecop (0.9.4) @@ -761,9 +775,6 @@ GEM zeitwerk (~> 2.2) warden (1.2.9) rack (>= 2.0.9) - watir (6.19.1) - regexp_parser (>= 1.2, < 3) - selenium-webdriver (>= 3.142.7) web-console (4.1.0) actionview (>= 6.0.0) activemodel (>= 6.0.0) @@ -776,7 +787,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket (1.2.9) + websocket (1.2.10) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -789,7 +800,7 @@ GEM nokogiri (~> 1.11) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.11) + zeitwerk (2.6.12) zip_tricks (5.6.0) zipline (1.4.1) actionpack (>= 6.0, < 8.0) @@ -811,6 +822,7 @@ DEPENDENCIES administrate administrate-field-enum after_party + ancestry anchored axe-core-rspec bcrypt @@ -868,6 +880,7 @@ DEPENDENCIES lograge logstash-event mailjet + maintenance_tasks matrix memory_profiler mina @@ -914,6 +927,7 @@ DEPENDENCIES sentry-ruby shoulda-matchers sib-api-v3-sdk + sidekiq simple_xlsx_reader skylight spreadsheet_architect diff --git a/machines/compute01/ds-fr/package/rubyEnv/gemset.nix b/machines/compute01/ds-fr/package/rubyEnv/gemset.nix index 45ac2d2..c3974fd 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/gemset.nix +++ b/machines/compute01/ds-fr/package/rubyEnv/gemset.nix @@ -191,10 +191,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; administrate = { dependencies = ["actionpack" "actionview" "activerecord" "jquery-rails" "kaminari" "sassc-rails" "selectize-rails"]; @@ -238,6 +238,17 @@ }; version = "1.11.2"; }; + ancestry = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "183wbrpriw4yamlm5zkng66vm3760s19qnzc5vq9l8aw837nngxg"; + type = "gem"; + }; + version = "4.3.3"; + }; anchored = { groups = ["default"]; platforms = []; @@ -269,15 +280,15 @@ version = "1.0.1"; }; axe-core-api = { - dependencies = ["capybara" "dumb_delegator" "selenium-webdriver" "virtus" "watir"]; + dependencies = ["dumb_delegator" "virtus"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r14qp4wima3dldfk543krd53n6i86jhymq39vq002yq23d8i7n4"; + sha256 = "0bx67lskxslfd2mpim3kqrxa4sx4qhvnpjpr57j1ll2xppyl9kw8"; type = "gem"; }; - version = "4.2.1"; + version = "4.8.0"; }; axe-core-rspec = { dependencies = ["axe-core-api" "dumb_delegator" "virtus"]; @@ -285,10 +296,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07fibb6fw201wba0gh88bykmrp4shpn894bjsbrk847m3s99xjdz"; + sha256 = "07niarqd2lrbgnw00biyigc48lbdv4vy68p57myliz7k82nizidj"; type = "gem"; }; - version = "4.2.1"; + version = "4.8.0"; }; axiom-types = { dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; @@ -317,10 +328,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "048z3fvcknqx7ikkhrcrykxlqmf9bzc7l0y5h1cnvrc9n2qf0k8m"; + sha256 = "14crcsmcsyiskr9xzgzcfz2dr74zg1jvavrrxpf5vnn9q75fakz9"; type = "gem"; }; - version = "3.1.18"; + version = "3.1.19"; }; benchmark-ips = { groups = ["development"]; @@ -384,6 +395,16 @@ }; version = "5.4.1"; }; + brow = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zsgsd9h2h3id5wy2jbmkackifv348n636apy3cjymk736q7vdxv"; + type = "gem"; + }; + version = "0.4.1"; + }; browser = { groups = ["default"]; platforms = []; @@ -694,10 +715,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vpd7d61d4pfmyb2plnnv82wmczzlhw4k4gjhd2fv4r6vq8ilqqi"; + sha256 = "121ljaaapil79dcsl5mkh5k613hv58z4z3g2lrnzb5qvqpb3h1j8"; type = "gem"; }; - version = "4.9.2"; + version = "4.9.3"; }; devise-i18n = { dependencies = ["devise"]; @@ -923,15 +944,15 @@ version = "1.0.1"; }; flipper = { - dependencies = ["concurrent-ruby"]; + dependencies = ["brow" "concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1myzrakl70fql0kpaqz0rnb584mfghjc4kci4cafgrl6hs4qc8gs"; + sha256 = "1jnwwq8qzk7b3xvhrc3pm401lysqmv3mcsv3r5wqpb0jxwgyl79q"; type = "gem"; }; - version = "0.26.0"; + version = "1.0.0"; }; flipper-active_record = { dependencies = ["activerecord" "flipper"]; @@ -939,10 +960,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0590i5q5w0c4m7f3c1p9rc52q75912wav2p3pb182zs19l0b0njs"; + sha256 = "04knwacvqyf7g3q7rdp4svbkysr3j8j39381b8r49vilwj0xp5dp"; type = "gem"; }; - version = "0.26.0"; + version = "1.0.0"; }; flipper-ui = { dependencies = ["erubi" "flipper" "rack" "rack-protection" "sanitize"]; @@ -950,10 +971,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03znj5kd3a9y3a8q58z6vfzppvf7wn06i3sv3wab3fdzs3n6kplw"; + sha256 = "0123zfy3jarw7vbsk0wzbpwlrg778ivvvsr1c53xwbkkm0r5s858"; type = "gem"; }; - version = "0.26.0"; + version = "1.0.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1024,10 +1045,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1381dlwx937hsvc71xqbxkp14b5vwnzrsh7jpvnn3a8naqcdif1j"; + sha256 = "120lqyq308q8hg8ykawd7cp3k2ck8z9g5f9ffijp8dn2k9f21fjc"; type = "gem"; }; - version = "1.6.5"; + version = "1.8.2"; }; globalid = { dependencies = ["activesupport"]; @@ -1056,10 +1077,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w571rwcmr07jk3bcfrl0cdxdldmi7li53s4sirj976wbrbrrqfs"; + sha256 = "0ihkydzvc773vb9lfbpn293j0h45calxrgmp3y0z6ns786zvpx7q"; type = "gem"; }; - version = "2.0.15"; + version = "2.0.24"; }; graphql-batch = { dependencies = ["graphql" "promise.rb"]; @@ -1345,6 +1366,17 @@ }; version = "2.0.0"; }; + job-iteration = { + dependencies = ["activejob"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1br4chy8dzyrpvggyry9fqlk7sps9989qzl656ax9hzc9l7c8hvj"; + type = "gem"; + }; + version = "1.4.1"; + }; jquery-rails = { dependencies = ["rails-dom-testing" "railties" "thor"]; groups = ["default"]; @@ -1533,10 +1565,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; + sha256 = "0d5p9vg2qkqfy60i93mpd3b25kw4bdxfai034y5a94pxp5fws61c"; type = "gem"; }; - version = "2.21.3"; + version = "2.21.4"; }; mail = { dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; @@ -1560,6 +1592,17 @@ }; version = "1.6.0"; }; + maintenance_tasks = { + dependencies = ["actionpack" "activejob" "activerecord" "job-iteration" "railties"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lxd0jm5l4cigqzn8q39y8c5ssqrbn2fkb0rdzkhzrnwj9n955ly"; + type = "gem"; + }; + version = "2.3.2"; + }; marcel = { groups = ["default"]; platforms = []; @@ -1657,10 +1700,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; minitest = { groups = ["default" "development" "test"]; @@ -1973,10 +2016,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; + sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.3"; }; puma = { dependencies = ["nio4r"]; @@ -2262,10 +2305,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ih4zghnb888jd5vh8ymvvkfx9bq7cyhi750zgvl7s64bzphwz9v"; + sha256 = "013p2968vqrr282yvxp3pyy5vn0nrgdppzqywbwbfjq2kkwx2fx9"; type = "gem"; }; - version = "0.14.1"; + version = "0.18.0"; }; regexp_parser = { groups = ["default" "development" "test"]; @@ -2294,10 +2337,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m9s0mkkprrz02gxhq0ijlwjy0nx1j5yrjf8ssjnhyagnx03lyrx"; + sha256 = "06ilkbbwvc8d0vppf8ywn1f79ypyymlb9krrhqv4g0q215zaiwlj"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.1"; }; rest-client = { dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; @@ -2315,10 +2358,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; rodf = { dependencies = ["builder" "dry-inflector" "rubyzip"]; @@ -2583,10 +2626,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kymrjdpbmn4yaml3aaqyj1dzj8gqmm9h030dc2rj5mvja7fpi28"; + sha256 = "0wsw05y0h1ln3x2kvcw26fs9ivryb4xbjrb4hsk2pishkhydkz4j"; type = "gem"; }; - version = "6.0.2"; + version = "6.1.0"; }; sass = { dependencies = ["sass-listen"]; @@ -2670,10 +2713,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hwxxvx6j95ln82pjmrgyzg6qmf511dkcp5q79n6m5m8z4way8m3"; + sha256 = "037v9w6rwkdi9msydiyj31pxdlh4vcr8h8w3g1mzanbsas2m1b1a"; type = "gem"; }; - version = "4.10.0"; + version = "4.13.1"; }; sentry-delayed_job = { dependencies = ["delayed_job" "sentry-ruby"]; @@ -2730,6 +2773,17 @@ }; version = "7.4.0"; }; + sidekiq = { + dependencies = ["concurrent-ruby" "connection_pool" "rack" "redis-client"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0clkpka6liyh0ky3mcrlr42l4kzivwias26q90ypmw3r5yvglc5j"; + type = "gem"; + }; + version = "7.2.0"; + }; simple_xlsx_reader = { dependencies = ["nokogiri" "rubyzip"]; groups = ["development" "test"]; @@ -2895,10 +2949,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; + sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.0"; }; thread_safe = { groups = ["default" "test"]; @@ -3121,17 +3175,6 @@ }; version = "1.2.9"; }; - watir = { - dependencies = ["regexp_parser" "selenium-webdriver"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1aygylc0xayy2lsi9423ijszwgblm618ys9kpm285y770yxnia49"; - type = "gem"; - }; - version = "6.19.1"; - }; web-console = { dependencies = ["actionview" "activemodel" "bindex" "railties"]; groups = ["development"]; @@ -3170,10 +3213,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; + sha256 = "1a4zc8d0d91c3xqwapda3j3zgpfwdbj76hkb69xn6qvfkfks9h9c"; type = "gem"; }; - version = "1.2.9"; + version = "1.2.10"; }; websocket-driver = { dependencies = ["websocket-extensions"]; @@ -3234,10 +3277,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd"; + sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn"; type = "gem"; }; - version = "2.6.11"; + version = "2.6.12"; }; zip_tricks = { groups = ["default"]; diff --git a/machines/compute01/ds-fr/package/update.sh b/machines/compute01/ds-fr/package/update.sh index 1080909..81653fa 100755 --- a/machines/compute01/ds-fr/package/update.sh +++ b/machines/compute01/ds-fr/package/update.sh @@ -33,15 +33,29 @@ gitUrl="https://github.com/demarches-simplifiees/demarches-simplifiees.fr.git" if [ -n "$version" ]; then git clone --depth 1 --branch $version $gitUrl . + + echo "[+] ds-fr version:" + echo "- $version" else git clone --depth 1 $gitUrl . + + echo "[+] ds-fr version:" + echo "- $(git rev-parse HEAD)" fi # Generate gemset.nix -nix-shell -p bundix --run "bundix -l" +echo "[+] Updating gem files" +nix-shell -p bundix --run "bundix -l" > /dev/null # Copy the new files cp gemset.nix Gemfile Gemfile.lock "$CWD/rubyEnv/" # Print the new source details -nix-shell -p nurl --run "nurl $gitUrl $version" +echo "[+] New hash:" +nix-shell -p nurl --run "nurl --hash $gitUrl $version" + +# Print Yarn deps hash +echo "[+] New dependencies hash:" +hash=$(nix-shell -p prefetch-yarn-deps --run "prefetch-yarn-deps yarn.lock") + +nix-hash --to-sri --type sha256 "$hash"