From d389cb38cd87e81f33c7484f4acfd18e7e4e2cd4 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Mon, 20 Nov 2023 17:24:12 +0100 Subject: [PATCH] feat(ds-fr): Update to bleeding-edge version --- machines/compute01/ds-fr/package/meta.nix | 6 +++--- .../compute01/ds-fr/package/rubyEnv/Gemfile | 1 - .../ds-fr/package/rubyEnv/Gemfile.lock | 6 +----- .../ds-fr/package/rubyEnv/gemset.nix | 15 ++----------- machines/compute01/ds-fr/package/update.sh | 21 +++++++++---------- 5 files changed, 16 insertions(+), 33 deletions(-) diff --git a/machines/compute01/ds-fr/package/meta.nix b/machines/compute01/ds-fr/package/meta.nix index 3f21462..4fe7f66 100644 --- a/machines/compute01/ds-fr/package/meta.nix +++ b/machines/compute01/ds-fr/package/meta.nix @@ -1,5 +1,5 @@ { - version = "2023-11-16-01"; - src-hash = "sha256-A+l8jEWSlCrCdC2/4XGQ9tzXolw7pJbABIPNcgLz52Y="; - deps-hash = "sha256-bEjrlOsnzcX3InQ3QwNCmGBPnX4m740F7cf94n52Tu8="; + version = "9a5e4d4ea587b86ac06f9e515d07ac2fa04f1838"; + src-hash = "sha256-MxuuX+UM5zUExqIBDR1rZiQGEC4j+LiMbKUWEHc2zb4="; + deps-hash = "sha256-kg9AuJE/5TzA51/LTJ94P3x+5mQ1LpGLz7xJ4AgcQLk="; } diff --git a/machines/compute01/ds-fr/package/rubyEnv/Gemfile b/machines/compute01/ds-fr/package/rubyEnv/Gemfile index 32f699d..e4d859b 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/Gemfile +++ b/machines/compute01/ds-fr/package/rubyEnv/Gemfile @@ -4,7 +4,6 @@ gem 'rails', '~> 7.0.5' # allows update to security fixes at any time gem 'aasm' gem 'acsv' -gem 'active_link_to' # Automatically set a class on active links gem 'active_model_serializers' gem 'activestorage-openstack' gem 'active_storage_validations' diff --git a/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock b/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock index 1257c85..a85c792 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock +++ b/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock @@ -49,9 +49,6 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - active_link_to (1.0.5) - actionpack - addressable active_model_serializers (0.10.13) actionpack (>= 4.1, < 7.1) activemodel (>= 4.1, < 7.1) @@ -240,7 +237,7 @@ GEM excon (0.102.0) factory_bot (6.1.0) activesupport (>= 5.0.0) - ffi (1.16.2) + ffi (1.16.3) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -814,7 +811,6 @@ PLATFORMS DEPENDENCIES aasm acsv - active_link_to active_model_serializers active_storage_validations activestorage-openstack diff --git a/machines/compute01/ds-fr/package/rubyEnv/gemset.nix b/machines/compute01/ds-fr/package/rubyEnv/gemset.nix index 464eafe..e113323 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/gemset.nix +++ b/machines/compute01/ds-fr/package/rubyEnv/gemset.nix @@ -86,17 +86,6 @@ }; version = "7.0.7.2"; }; - active_link_to = { - dependencies = ["actionpack" "addressable"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1firn5hw8dkqlz1c2plprrzja5f0xs606qpwx7qrsn0l7mxq8c28"; - type = "gem"; - }; - version = "1.0.5"; - }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; groups = ["default"]; @@ -927,10 +916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0faxk6nsyh36anl8bmsk1b2cfaxsn9398bg9wcn2scqcpf1axwlf"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.16.2"; + version = "1.16.3"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; diff --git a/machines/compute01/ds-fr/package/update.sh b/machines/compute01/ds-fr/package/update.sh index 304f4c0..2bfdf41 100755 --- a/machines/compute01/ds-fr/package/update.sh +++ b/machines/compute01/ds-fr/package/update.sh @@ -7,14 +7,14 @@ while [ "$#" -gt 0 ]; do i="$1" shift 1 case "$i" in - --version|-v) + --version | -v) version="$1" shift 1 ;; --git-args) - gitArgs="$gitArgs $1" - shift 1 - ;; + gitArgs="$gitArgs $1" + shift 1 + ;; *) echo "$0: unknown option \`$i'" exit 1 @@ -33,19 +33,18 @@ 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)" + version="$(git rev-parse HEAD)" fi +echo "[+] ds-fr version:" +echo "- $version" + # Generate gemset.nix echo "[+] Updating gem files" -nix-shell -p bundix --run "bundix -l" > /dev/null +nix-shell -p bundix --run "bundix -l" >/dev/null # Copy the new files cp gemset.nix Gemfile Gemfile.lock "$CWD/rubyEnv/" @@ -60,7 +59,7 @@ hash=$(nix-shell -p prefetch-yarn-deps --run "prefetch-yarn-deps yarn.lock") DEPS_HASH=$(nix-hash --to-sri --type sha256 "$hash") -cat < "$CWD/meta.nix" +cat <"$CWD/meta.nix" { version = "$version"; src-hash = "$SRC_HASH";