Skip to content

Commit

Permalink
Merge pull request #237 from cetinajero/hotfix/commit-all-release-files
Browse files Browse the repository at this point in the history
Commit all release files into a single commit
  • Loading branch information
mlopez-grupopv committed Dec 13, 2019
2 parents 78e6e55 + cc27517 commit 57e3632
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 15 deletions.
6 changes: 3 additions & 3 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@ css:
bootstrap:
primary: "#1A69D5"
navbar:
background-color: "#1A69D5"
background-color: "#FFF"
header:
background-color: "#1A69D5"
menu:
font-color: "#1A69D5"
icons: "#1A69D5"
footer:
top:
background-color: "#1D6BD6"
bottom:
background-color: "#1A69D5"
bottom:
background-color: "#F7F7F7"
font-color: "#FFF"

awards:
Expand Down
7 changes: 0 additions & 7 deletions index.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
---
#
# You don't need to edit this file, it's empty on purpose.
# Edit jekyll-theme-marketing's home layout instead if you wanna make some changes
# See: https://jekyllrb.com/docs/themes/#overriding-theme-defaults
#
layout: home
title: Home

Expand Down Expand Up @@ -65,7 +60,6 @@ special-offers:
brand: "Vertex"
commercial: "6 Radios VLR150 + Multicargador"
href: "/radios/motorola/analog/portable/vlr150/cu1464bke4aa/"

---
{% include components/sliders/revolution-slider.html %}

Expand Down Expand Up @@ -112,4 +106,3 @@ special-offers:
href="/"
%}
</section>
---
2 changes: 1 addition & 1 deletion jekyll-theme-marketing.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Gem::Specification.new do |spec|

all_files = `git ls-files -z`.split("\x0")
spec.files = all_files.select do |f|
gemfiles = /^(assets|_layouts|_includes|_sass|LICENSE|README)/i
gemfiles = /^(assets|_layouts|_includes|_sass|lib|LICENSE|README)/i
f.match(gemfiles)
end

Expand Down
1 change: 1 addition & 0 deletions lib/jekyll_theme_marketing/deploy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ def gem
def create_release_commit(old, new, type)
update_changelog old, new
update_npm old, new
Git.add
system "bump #{type} --tag"
end

Expand Down
12 changes: 8 additions & 4 deletions lib/jekyll_theme_marketing/git.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,22 @@
module Git
module_function

def add(files = '.')
system "git add #{files}"
end

def checkout_new_branch(name)
system 'git checkout master'
system 'git pull origin master'
system "git checkout #{name}" # if the branch doesn't exist, create it
system "git checkout -b #{name}" # if the branch does exist, switch to it
end

def push(remote = '', branch = '', options = '')
system "git push #{options} #{remote} #{branch}"
end

def list_commits(old, new, options = '')
`git log #{options} #{old}..#{new}`
end

def push(remote = '', branch = '', options = '')
system "git push #{options} #{remote} #{branch}"
end
end

0 comments on commit 57e3632

Please sign in to comment.