From f154d713b26e37f26a3968b28b8574c54d0038fe Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 7 Feb 2024 21:57:57 -0600 Subject: [PATCH 1/2] ben's version's --- Makefile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Makefile b/Makefile index 73b4180..78f9ecb 100644 --- a/Makefile +++ b/Makefile @@ -45,3 +45,16 @@ reset: # ruby 3.2.2 (2023-03-30 revision e51014f9c0) [x86_64-linux] # ruby: /usr/bin/ruby /usr/lib/x86_64-linux-gnu/ruby /usr/lib/ruby /home/mariam/.rbenv/shims/ruby /usr/share/man/man1/ruby.1.gz # mariam@flippy:~/obdev$ +# +# +firstscaffold: +# rails generate lsdslkjdkl Product + +# ben@tempy:~/obdev$ make version +# Rails 7.1.2 +# rails: /usr/bin/rails /home/ben/.rbenv/shims/rails +# npm 10.2.4 +# npm: /usr/bin/npm /usr/share/npm /home/ben/.nvm/versions/node/v20.11.0/bin/npm /usr/share/man/man1/npm.1.gz +# yarn 1.22.19 +# yarn: /usr/bin/yarn /usr/share/yarn +# ruby 3.2.2 (2023-03-30 revision e51014f9c0) [x86_64-linux] +# ruby: /usr/bin/ruby /usr/lib/x86_64-linux-gnu/ruby /usr/lib/ruby /home/ben/.rbenv/shims/ruby /usr/share/man/man1/ruby.1.gz From 67d435d12b82d670cd0842254ab8d3c6eac38d67 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 7 Feb 2024 21:59:01 -0600 Subject: [PATCH 2/2] ignore these on failures for the test box --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 78f9ecb..91e7ae2 100644 --- a/Makefile +++ b/Makefile @@ -7,14 +7,14 @@ pull: git pull version: - @rails --version - @whereis rails - @echo "npm" `npm --version` - @whereis npm - @echo "yarn" `yarn -version` - @whereis yarn - @ruby --version - @whereis ruby + -@rails --version + -@whereis rails + -@echo "npm" `npm --version` + -@whereis npm + -@echo "yarn" `yarn -version` + -@whereis yarn + -@ruby --version + -@whereis ruby reset: git reset --hard