Skip to content
This repository has been archived by the owner on Jul 13, 2022. It is now read-only.

Commit

Permalink
Merge pull request #8 from xpring-eng/update_sub_module
Browse files Browse the repository at this point in the history
Update submodules for new naming scheme
  • Loading branch information
keefertaylor authored Sep 27, 2019
2 parents 516f62d + 48b0bf0 commit 85140bc
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[submodule "terram-protos"]
path = terram-protos
url = https://github.com/xpring-eng/terram-protos
[submodule "xpring-common-js"]
path = xpring-common-js
url = git@github.com:xpring-eng/xpring-common-js
branch = master
[submodule "terram"]
path = terram
url = [email protected]:xpring-eng/terram.git
[submodule "xpring-common-protocol-buffers"]
path = xpring-common-protocol-buffers
url = [email protected]:xpring-eng/xpring-common-protocol-buffers
branch = master
4 changes: 2 additions & 2 deletions scripts/bundle_js.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e -o pipefail
WORKING_DIR=$(pwd)

echo "Bundling JS"
cd terram
cd xpring-common-js

echo ">> Installing Node Dependencies"
npm i
Expand All @@ -20,4 +20,4 @@ echo "Done Bundling JS"
cd $WORKING_DIR
echo "Copying Artifacts"
mkdir -p ./XpringKit/Resources
cp terram/dist/bundled.js ./XpringKit/Resources/
cp xpring-common-js/dist/bundled.js ./XpringKit/Resources/
4 changes: 2 additions & 2 deletions scripts/regenerate_protos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ echo "Regenerating Terram Protos..."

mkdir -p ./XpringKit/generated
protoc \
--proto_path=./terram-protos/proto \
--proto_path=./xpring-common-protocol-buffers/proto \
--swift_opt=Visibility=Public \
--swift_out=./XpringKit/generated \
--swiftgrpc_out=./XpringKit/generated \
./terram-protos/proto/*.proto
./xpring-common-protocol-buffers/proto/*.proto

echo "All done!"
1 change: 0 additions & 1 deletion terram
Submodule terram deleted from 736f90
1 change: 0 additions & 1 deletion terram-protos
Submodule terram-protos deleted from 67d877
1 change: 1 addition & 0 deletions xpring-common-js
Submodule xpring-common-js added at 254d16
1 change: 1 addition & 0 deletions xpring-common-protocol-buffers

0 comments on commit 85140bc

Please sign in to comment.