Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macOS CI, gardening, and various small fixups #25

Merged
merged 9 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ on:
branches: [ master ]

jobs:
test:

test-linux:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Ruby
Expand All @@ -28,3 +26,16 @@ jobs:
run: bundle install
- name: Run tests
run: bundle exec rspec

test-mac:
runs-on: macos-14
steps:
- uses: actions/checkout@v3
- name: Set up Ruby
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
# (see https://github.com/ruby/setup-ruby#versioning):
uses: ruby/setup-ruby@v1
- name: Install dependencies
run: bundle install
- name: Run tests
run: bundle exec rspec
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# My Battlestation

Inspired by https://www.reddit.com/r/battlestations/. Spoiler alert: my actual battlestation is much less cool than any of these :stuck_out_tongue:
Inspired by https://www.reddit.com/r/battlestations/.

## Setting up

Expand All @@ -11,7 +11,3 @@ $ git clone https://github.com/bachand/battlestation.git
$ cd battlestation
$ ./bin/battlestation setup
```

## Gotchas

- [`setup`](bin/setup) must be run from a directory underneath this repo.
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The supported way to invoke bin/setup is via through the setup command shown earlier. The setup command ensures that the legacy setup script is invoked from within this repo.

3 changes: 0 additions & 3 deletions config/dotfiles/aliases.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ alias cdr="cd $HOME/repos"
alias sn='code'
alias v='vim'

alias cloudformation='aws cloudformation'
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not recall using these aliases recently.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I verified that these aliases aren't required by other code in this repository 👍

alias s3='aws s3'

# Apple says that anything requiring a developer to delete `DerivedData` is a serious bug in Xcode.
alias rmdd="echo I\'m sorry `id -un`, I\'m afraid I can\'t do that"

Expand Down
5 changes: 3 additions & 2 deletions lib/battlestation/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,9 @@ def configure_xcode
end

def run_legacy_setup_script(current_dirname)
setup_path = File.join current_dirname, '../../bin/setup'
system 'bash', '-c', setup_path
# The legacy setup script must be executed from a working directory within the repo to support
# using Git to determine the root directory of the repository.
Dir.chdir(current_dirname) { system 'bash', '-c', '../../bin/setup' }
end

def update_homebrew
Expand Down
5 changes: 2 additions & 3 deletions todo.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
- Integrate with Travis
- Make Sublime text the default way to open .txt, .md, etc. files
- Add a git command to delete all local branches not matching a regex. This would be useful for deleting all local branches that don't contain my prefix, `mb-`.
- Make VS Code the default way to open .txt, .md, etc. files
- Add a git command to delete all local branches not matching a regex. This would be useful for deleting all local branches that don't contain a prefix like `mb-`.
- Figure out a way to not have to run `bundle install` as an admin. Should the first thing that `battlestation` does be install `rbenv`/`rvm`? Or should we specify a path for bundler to install to?
- Add home folder to Finder sidebar
- Add https://youtu.be/St2jUxnCVKI?t=29s
Expand Down
Loading