search

lobsters / lobsters-ansible

Ansible playbook for lobste.rs
ISC License
78 stars 25 forks source link

Ruby 2.5 / Ubuntu 18.04/19 Changes #44

Closed hmadison closed 4 years ago

hmadison commented 5 years ago

Resolves #22

I've also gone in and resolved the deprecation warnings given off by Ansible 2.8 and moved config/database.yml into Ansible to make setting up the test server after a wipe a bit simpler.

I'm currently running master on the test server

thomasdziedzic commented 5 years ago

Seems like you introduced some kind of conflicts into the repo:

Conflicting files
roles/lobsters/tasks/main.yml
alanpost commented 4 years ago

I just fiddled with the PR/merge settings in this repository, forbidding merge commits to master. @hmadison, will you force push these changes to remove the merge commit that appears here?

pushcx commented 4 years ago

I'm curious, why did you forbid merge commits to master? To better represent that this is coupled to a single running system that can't have branches?

alanpost commented 4 years ago

I'm curious, why did you forbid merge commits to master? To better represent that this is coupled to a single running system that can't have branches?

It's really nothing more than habit and preference. I like rebase workflows when I can get them (i.e., multi-branch codebases that don't need or benefit from octopus merging). In truth, across all the projects I'm involved in, I see and work with both.