DGNum/infrastructure
9
6
Fork 1
Code Issues 13 Pull requests 4 Actions Packages Projects 1 Releases Wiki Activity

feat(ds-fr): Update to bleeding-edge version

Browse source
This commit is contained in:
Tom Hubrecht 2023-11-20 17:24:12 +01:00
parent 03fa9e2aa4
commit d389cb38cd
5 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
machines/compute01/ds-fr/package/meta.nix
View file

@ -1,5 +1,5 @@
{ {
version = "2023-11-16-01"; version = "9a5e4d4ea587b86ac06f9e515d07ac2fa04f1838";
src-hash = "sha256-A+l8jEWSlCrCdC2/4XGQ9tzXolw7pJbABIPNcgLz52Y="; src-hash = "sha256-MxuuX+UM5zUExqIBDR1rZiQGEC4j+LiMbKUWEHc2zb4=";
deps-hash = "sha256-bEjrlOsnzcX3InQ3QwNCmGBPnX4m740F7cf94n52Tu8="; deps-hash = "sha256-kg9AuJE/5TzA51/LTJ94P3x+5mQ1LpGLz7xJ4AgcQLk=";
} }

1
machines/compute01/ds-fr/package/rubyEnv/Gemfile
View file

@ -4,7 +4,6 @@ gem 'rails', '~> 7.0.5' # allows update to security fixes at any time
gem 'aasm' gem 'aasm'
gem 'acsv' gem 'acsv'
gem 'active_link_to' # Automatically set a class on active links
gem 'active_model_serializers' gem 'active_model_serializers'
gem 'activestorage-openstack' gem 'activestorage-openstack'
gem 'active_storage_validations' gem 'active_storage_validations'

6
machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock
View file

@ -49,9 +49,6 @@ GEM
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
active_link_to (1.0.5)
actionpack
addressable
active_model_serializers (0.10.13) active_model_serializers (0.10.13)
actionpack (>= 4.1, < 7.1) actionpack (>= 4.1, < 7.1)
activemodel (>= 4.1, < 7.1) activemodel (>= 4.1, < 7.1)
@ -240,7 +237,7 @@ GEM
excon (0.102.0) excon (0.102.0)
factory_bot (6.1.0) factory_bot (6.1.0)
activesupport (>= 5.0.0) activesupport (>= 5.0.0)
ffi (1.16.2) ffi (1.16.3)
ffi-compiler (1.0.1) ffi-compiler (1.0.1)
ffi (>= 1.0.0) ffi (>= 1.0.0)
rake rake
@ -814,7 +811,6 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
aasm aasm
acsv acsv
active_link_to
active_model_serializers active_model_serializers
active_storage_validations active_storage_validations
activestorage-openstack activestorage-openstack

15
machines/compute01/ds-fr/package/rubyEnv/gemset.nix
View file

@ -86,17 +86,6 @@
}; };
version = "7.0.7.2"; 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 = { active_model_serializers = {
dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"];
groups = ["default"]; groups = ["default"];
@ -927,10 +916,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0faxk6nsyh36anl8bmsk1b2cfaxsn9398bg9wcn2scqcpf1axwlf"; sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
type = "gem"; type = "gem";
}; };
version = "1.16.2"; version = "1.16.3";
}; };
ffi-compiler = { ffi-compiler = {
dependencies = ["ffi" "rake"]; dependencies = ["ffi" "rake"];

21
machines/compute01/ds-fr/package/update.sh
View file

@ -7,14 +7,14 @@ while [ "$#" -gt 0 ]; do
i="$1" i="$1"
shift 1 shift 1
case "$i" in case "$i" in
--version|-v) --version | -v)
version="$1" version="$1"
shift 1 shift 1
;; ;;
--git-args) --git-args)
gitArgs="$gitArgs $1" gitArgs="$gitArgs $1"
shift 1 shift 1
;; ;;
*) *)
echo "$0: unknown option \`$i'" echo "$0: unknown option \`$i'"
exit 1 exit 1
@ -33,19 +33,18 @@ gitUrl="https://github.com/demarches-simplifiees/demarches-simplifiees.fr.git"
if [ -n "$version" ]; then if [ -n "$version" ]; then
git clone --depth 1 --branch $version $gitUrl . git clone --depth 1 --branch $version $gitUrl .
echo "[+] ds-fr version:"
echo "- $version"
else else
git clone --depth 1 $gitUrl . git clone --depth 1 $gitUrl .
echo "[+] ds-fr version:" version="$(git rev-parse HEAD)"
echo "- $(git rev-parse HEAD)"
fi fi
echo "[+] ds-fr version:"
echo "- $version"
# Generate gemset.nix # Generate gemset.nix
echo "[+] Updating gem files" 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 # Copy the new files
cp gemset.nix Gemfile Gemfile.lock "$CWD/rubyEnv/" 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") DEPS_HASH=$(nix-hash --to-sri --type sha256 "$hash")
cat <<EOF > "$CWD/meta.nix" cat <<EOF >"$CWD/meta.nix"
{ {
version = "$version"; version = "$version";
src-hash = "$SRC_HASH"; src-hash = "$SRC_HASH";