Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
ansible
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
cotech
ansible
Commits
377e6111
Commit
377e6111
authored
7 years ago
by
Chris Croome
Browse files
Options
Downloads
Plain Diff
Merge branch 'minor-deployment-tweaks' into 'master'
Minor tweaks to ensure clean git status See merge request
!3
parents
f24d57dc
9037a026
No related branches found
Branches containing commit
No related tags found
1 merge request
!3
Minor tweaks to ensure clean git status
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/live2dev/templates/cron.j2
+3
-0
3 additions, 0 deletions
roles/live2dev/templates/cron.j2
roles/live2dev/templates/update.j2
+1
-1
1 addition, 1 deletion
roles/live2dev/templates/update.j2
with
4 additions
and
1 deletion
roles/live2dev/templates/cron.j2
+
3
−
0
View file @
377e6111
...
...
@@ -13,6 +13,9 @@ fi
cd
~/sites
# Remove any untracked files/directories
git clean
-fd
GIT_PULL
=
$(
git pull |
grep
-v
"up-to-date"
)
if
[[
${
GIT_PULL
}
!=
""
]]
;
then
...
...
This diff is collapsed.
Click to expand it.
roles/live2dev/templates/update.j2
+
1
−
1
View file @
377e6111
...
...
@@ -15,7 +15,7 @@ cd /home/{{ item }}/sites
git stash save
"Local changes stashed"
git pull
rm
-rf
web/wp
composer
update
composer
install
cd
web/app/themes/coop-tech-oowp-theme
composer update
npm
install
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment