Skip to content

Commit 4d2107e

Browse files
committed
Fix scripts for local deployment
1 parent ab4f329 commit 4d2107e

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

Rakefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ task :build do |t, args|
1010
cmd << '--trace'
1111
cmd << '--lsi' if ENV['LSI']
1212
cmd << '--watch' if args.extras.include? 'watch'
13-
cmd.concat(%w[--config _config.yml,_local.yml]) if File.file? '_local.yml'
13+
unless ENV['JEKYLL_ENV'] == 'production'
14+
cmd.concat(%w[--config _config.yml,_local.yml]) if File.file? '_local.yml'
15+
end
1416
begin
1517
sh(*cmd)
1618
rescue Interrupt

_config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ exclude:
168168
- .github/
169169
- .gitignore
170170
- .jekyll-assets-cache
171+
- .ruby-lsp/
171172
- .sass-cache
172173
- .travis.yml
173174
- .vscode

script/deploy-actions.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ source_msg="$(git log -1 --pretty="[%h] %B")"
1515

1616
pushd "$SRC" &>/dev/null
1717
e_info "Adding commit info"
18-
git config user.name "${GIT_USER:-GitHub}"
19-
git config user.email "${GIT_EMAIL:-noreply@github.com}"
2018
git add --all
21-
git commit --quiet --message "${COMMIT_MSG}" --message "$source_msg"
19+
git \
20+
-c user.name "${GIT_USER:-GitHub}" \
21+
-c user.email "${GIT_EMAIL:-noreply@github.com}" \
22+
commit --quiet --message "${COMMIT_MSG}" --message "$source_msg"
2223

2324
e_info "Pushing to GitHub"
2425
SSH_AUTH_SOCK=none \

script/generate-cname.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
require 'yaml'
55

66
yaml_file = ARGV[0] || '_config.yml'
7-
output_dir = ARGV[1] || '_site'
7+
output_dir = ARGV[1] || ENV['SRC'] || '_site'
88

99
config = YAML.load_file yaml_file, aliases: true
1010
File.open "#{output_dir}/CNAME", 'w' do |f|

script/generate-redirects.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
yaml_file = ARGV[0] || '_config.yml'
88
config = YAML.load_file yaml_file, aliases: true
99
site_url = config['url'] || ''
10-
site_dir = ARGV[1] || config['destination'] || '_site'
10+
site_dir = ARGV[1] || ENV['SRC'] || config['destination'] || '_site'
1111
style = ENV['STYLE'] || 'cloudflare'
1212

1313
rcode = case style

0 commit comments

Comments
 (0)