From e442f324ace2175687c8d9a30c0a6324d19008d8 Mon Sep 17 00:00:00 2001 From: Dana Sherson Date: Mon, 4 Dec 2023 23:56:20 +1300 Subject: [PATCH] Github actions debug --- .spellr_wordlists/english.txt | 1 + scripts/ci.sh | 6 ++++++ scripts/install.sh | 5 +++-- scripts/update.sh | 3 ++- spec/git_rubocop_spec.rb | 1 + 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.spellr_wordlists/english.txt b/.spellr_wordlists/english.txt index 0d27915..f7183bb 100644 --- a/.spellr_wordlists/english.txt +++ b/.spellr_wordlists/english.txt @@ -261,6 +261,7 @@ snginx speckly spotify sqlite +stephenway stylelint stylelintrc submodule diff --git a/scripts/ci.sh b/scripts/ci.sh index cf1bd6d..60039bf 100755 --- a/scripts/ci.sh +++ b/scripts/ci.sh @@ -2,10 +2,16 @@ # we assume this is checked out to ~/.dotfiles ln -s $PWD ~/.dotfiles +echo 'ci.sh env:' env ~/.dotfiles/scripts/install.sh +echo 'ci.sh after install.sh env:' +env . ~/.bash_profile +echo 'ci.sh after source bash_profile env:' +env git config --global commit.gpgsign false ruby -v +echo 'what ruby thinks env is:' ruby -e 'puts `env`' bundle exec rspec diff --git a/scripts/install.sh b/scripts/install.sh index cc9fab3..a83e9cb 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,7 +1,8 @@ #!/bin/bash set -e -export PATH="~/.dotfiles/bin:$PATH" + +export PATH="$HOME/.dotfiles/bin:$PATH" echodo ln -sf ~/.dotfiles/bash_profile ~/.bash_profile echodo ln -sf ~/.dotfiles/bashrc ~/.bashrc @@ -30,7 +31,7 @@ if [[ -z "$CI" ]]; then brew install mas fi -~/.dotfiles/scripts/update.sh +. ~/.dotfiles/scripts/update.sh open monokai.terminal/Monokai.terminal defaults write com.apple.Terminal Shell -string /bin/bash diff --git a/scripts/update.sh b/scripts/update.sh index ef81af7..e7cfa9e 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -26,6 +26,7 @@ fi git_update_submodules ( cd github-cctray && git remote add upstream git@github.com:joejag/github-cctray.git ) +( cd monokai.terminal && git remote add upstream git@github.com:stephenway/monokai.terminal.git ) if [[ -z "$CI" ]]; then ruby-install 3.0 @@ -34,4 +35,4 @@ if [[ -z "$CI" ]]; then ruby-install 3.3.0-preview3 fi -install_launchagents.sh +. ~/.dotfiles/scripts/install_launchagents.sh diff --git a/spec/git_rubocop_spec.rb b/spec/git_rubocop_spec.rb index fd1043c..1058c7e 100644 --- a/spec/git_rubocop_spec.rb +++ b/spec/git_rubocop_spec.rb @@ -2,6 +2,7 @@ RSpec.describe 'git rubocop hooks' do before do + puts 'what ruby run thinks env is:' puts run('env').output puts run('ruby -v').output copy_file('.ruby-version')