-
Notifications
You must be signed in to change notification settings - Fork 326
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix capistrano deployments from master.
Capistrano-based deploys (to overlay changes from master on top of an existing package installation) had become broken somewhere along the way to the v0.14 release. This fixes the deployments by refactoring the deployments to leverage more of the normal build process, so our existing build process for gems/lua/admin-ui can be reused. #351
- Loading branch information
Showing
12 changed files
with
176 additions
and
191 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| function(_luarocks_install tree_dir package version hash) | ||
| ExternalProject_Add( | ||
| luarock_${package} | ||
| DEPENDS luarocks ${ARGV5} | ||
| URL https://luarocks.org/${package}-${version}.rockspec | ||
| URL_HASH MD5=${hash} | ||
| DOWNLOAD_NO_EXTRACT 1 | ||
| CONFIGURE_COMMAND "" | ||
| BUILD_COMMAND "" | ||
| INSTALL_COMMAND ${LUAROCKS_CMD} --tree=${tree_dir} install ${package} ${version} ${ARGV4} | ||
| COMMAND find ${tree_dir} -name *.so -exec chrpath -d {} $<SEMICOLON> | ||
| ) | ||
| endfunction() | ||
|
|
||
| function(luarocks_install package version hash) | ||
| _luarocks_install(${VENDOR_DIR} ${package} ${version} ${hash} ${ARGV3} ${ARGV4}) | ||
| endfunction() | ||
|
|
||
| function(test_luarocks_install package version hash) | ||
| _luarocks_install(${TEST_VENDOR_DIR} ${package} ${version} ${hash} ${ARGV3} ${ARGV4}) | ||
| endfunction() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| source "https://rubygems.org" | ||
|
|
||
| gem "capistrano", "~> 3.4.0" | ||
| gem "dotenv", "~> 2.0.2" | ||
| gem "capistrano", "~> 3.6.1" | ||
| gem "capistrano-rsync-bladrak", "~> 1.4.2" | ||
| gem "dotenv", "~> 2.2.1" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,34 @@ | ||
| GEM | ||
| remote: https://rubygems.org/ | ||
| specs: | ||
| capistrano (3.4.0) | ||
| airbrussh (1.2.0) | ||
| sshkit (>= 1.6.1, != 1.7.0) | ||
| capistrano (3.6.1) | ||
| airbrussh (>= 1.0.0) | ||
| capistrano-harrow | ||
| i18n | ||
| rake (>= 10.0.0) | ||
| sshkit (~> 1.3) | ||
| colorize (0.7.7) | ||
| dotenv (2.0.2) | ||
| i18n (0.7.0) | ||
| sshkit (>= 1.9.0) | ||
| capistrano-harrow (0.5.3) | ||
| capistrano-rsync-bladrak (1.4.2) | ||
| capistrano (>= 3.0.0.pre14, < 4) | ||
| dotenv (2.2.1) | ||
| i18n (0.8.4) | ||
| net-scp (1.2.1) | ||
| net-ssh (>= 2.6.5) | ||
| net-ssh (3.0.1) | ||
| rake (10.4.2) | ||
| sshkit (1.7.1) | ||
| colorize (>= 0.7.0) | ||
| net-ssh (4.1.0) | ||
| rake (12.0.0) | ||
| sshkit (1.13.1) | ||
| net-scp (>= 1.1.2) | ||
| net-ssh (>= 2.8.0) | ||
|
|
||
| PLATFORMS | ||
| ruby | ||
|
|
||
| DEPENDENCIES | ||
| capistrano (~> 3.4.0) | ||
| dotenv (~> 2.0.2) | ||
| capistrano (~> 3.6.1) | ||
| capistrano-rsync-bladrak (~> 1.4.2) | ||
| dotenv (~> 2.2.1) | ||
|
|
||
| BUNDLED WITH | ||
| 1.15.1 |
Oops, something went wrong.