removed local psql call#349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicky-g merged 8 commits into from
Apr 3, 2020
Merged

removed local psql call #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4c44330
replacing local psql call to check db existence with psql call within…
vicky-g Mar 31, 2020
666b54d
testing setup_remote_docker property to fix ci error
vicky-g Apr 2, 2020
085ffa6
adding logic to run docker exec command if not circleci build, else r…
vicky-g Apr 3, 2020
cf10544
adding the fi at end of if else for shell script
vicky-g Apr 3, 2020
2d79177
adding back psql command in package.json
vicky-g Apr 3, 2020
50401a8
adding command -v psql command to check if psql existts
vicky-g Apr 3, 2020
e85aa52
adding changes to identity service too
vicky-g Apr 3, 2020
5ed4703
updating comments
vicky-g Apr 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ jobs:
cd creator-node
export redisPort=6379
export spOwnerWallet='yes'
export isCIBuild=true
npm run test

test-discovery-provider:
Expand DownExpand Up@@ -370,6 +371,7 @@ jobs:
cd identity-service/
export POSTGRES_TEST_PORT=5432
export redisPort=6379
export isCIBuild=true
npm run test

docker-build-and-push:
Expand Down
5 changes: 2 additions & 3 deletions creator-node/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,9 @@
"start": "nodemon src/index.js | ./node_modules/.bin/bunyan || exit 0",
"test": "./scripts/run-tests.sh",
"coverage": "nyc npm run test",
"report": "nyc report --reporter=html",
"report": "nyc report --reporter=html",
"lint": "./node_modules/.bin/standard",
"lint-fix": "./node_modules/.bin/standard --fix",
"psql": "psql -U postgres -h localhost -p 4432 -d audius_creator_node"
"lint-fix": "./node_modules/.bin/standard --fix"
},
"keywords": [],
"author": "",
Expand Down
13 changes: 10 additions & 3 deletions creator-node/scripts/run-tests.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,12 +14,19 @@ export logLevel='info'

# Locally, the docker-compose files set up a database named audius_creator_node. For
# tests, we use audius_creator_node_test. The below block checks if
# audius_creator_node_test exists, and if not, creates it (the tests will fail if this
# audius_creator_node_test exists in creator node 1, and if not, creates it (the tests will fail if this
# database does not exist). If psql is not installed (ex. in CircleCI), this command will
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_creator_node_test instead of
# audius_creator_node.
if [ -x "$(command -v psql)" ]; then
# audius_creator_node.

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build.
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
docker exec -i audius-creator-node_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_creator_node_test\""
elif [ -x "$(command -v psql)" ]; then
# taken from https://stackoverflow.com/a/36591842
psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_creator_node_test"
fi
Expand Down
11 changes: 9 additions & 2 deletions identity-service/scripts/run-tests.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,15 @@ export logLevel='debug' #should be error
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_identity_service_test instead of
# audius_identity_service.
if [ -x "$(command -v psql)" ]; then

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build.
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
# taken from https://stackoverflow.com/a/36591842
docker exec -i audius-identity-service_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_identity_service_test\""
elif [ -x "$(command -v psql)" ]; then
psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_identity_service_test"
fi

Expand All@@ -33,4 +40,4 @@ fi

# linter

npm run lint
npm run lint
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
removed local psql call#349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

vicky-g
merged 8 commits into

from

Apr 3, 2020
 Merged


removed local psql call
#349
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
4c44330

replacing local psql call to check db existence with psql call within…


vicky-g Mar 31, 2020
666b54d

testing setup_remote_docker property to fix ci error


vicky-g Apr 2, 2020
085ffa6

adding logic to run docker exec command if not circleci build, else r…


vicky-g Apr 3, 2020
cf10544

adding the fi at end of if else for shell script


vicky-g Apr 3, 2020
2d79177

adding back psql command in package.json


vicky-g Apr 3, 2020
50401a8

adding command -v psql command to check if psql existts


vicky-g Apr 3, 2020
e85aa52

adding changes to identity service too


vicky-g Apr 3, 2020
5ed4703

updating comments


vicky-g Apr 3, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ jobs:
 cd creator-node
 export redisPort=6379
 export spOwnerWallet='yes'
 export isCIBuild=true
 npm run test

 test-discovery-provider:
Expand DownExpand Up@@ -370,6 +371,7 @@ jobs:
 cd identity-service/
 export POSTGRES_TEST_PORT=5432
 export redisPort=6379
 export isCIBuild=true
 npm run test

 docker-build-and-push:
Expand Down

5 changes: 2 additions & 3 deletions
creator-node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,9 @@
 "start": "nodemon src/index.js | ./node_modules/.bin/bunyan || exit 0",
 "test": "./scripts/run-tests.sh",
 "coverage": "nyc npm run test",
 "report": "nyc report --reporter=html",
 "report": "nyc report --reporter=html",
 "lint": "./node_modules/.bin/standard",
 "lint-fix": "./node_modules/.bin/standard --fix",
 "psql": "psql -U postgres -h localhost -p 4432 -d audius_creator_node"
 "lint-fix": "./node_modules/.bin/standard --fix"
 },
 "keywords": [],
 "author": "",
Expand Down

13 changes: 10 additions & 3 deletions
creator-node/scripts/run-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,12 +14,19 @@ export logLevel='info'

# Locally, the docker-compose files set up a database named audius_creator_node. For
# tests, we use audius_creator_node_test. The below block checks if
# audius_creator_node_test exists, and if not, creates it (the tests will fail if this
# audius_creator_node_test exists in creator node 1, and if not, creates it (the tests will fail if this
# database does not exist). If psql is not installed (ex. in CircleCI), this command will
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_creator_node_test instead of
# audius_creator_node.
if [ -x "$(command -v psql)" ]; then
# audius_creator_node. 

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build. 
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
 docker exec -i audius-creator-node_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_creator_node_test\""
elif [ -x "$(command -v psql)" ]; then
 # taken from https://stackoverflow.com/a/36591842
 psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_creator_node_test"
fi
Expand Down

11 changes: 9 additions & 2 deletions
identity-service/scripts/run-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,15 @@ export logLevel='debug' #should be error
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_identity_service_test instead of
# audius_identity_service.
if [ -x "$(command -v psql)" ]; then

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build. 
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
 # taken from https://stackoverflow.com/a/36591842
 docker exec -i audius-identity-service_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_identity_service_test\""
elif [ -x "$(command -v psql)" ]; then
 psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_identity_service_test"
fi

Expand All@@ -33,4 +40,4 @@ fi

 # linter

npm run lint
npm run lint

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
removed local psql call#349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

vicky-g
merged 8 commits into

from

Apr 3, 2020
 Merged


removed local psql call
#349
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
4c44330

replacing local psql call to check db existence with psql call within…


vicky-g Mar 31, 2020
666b54d

testing setup_remote_docker property to fix ci error


vicky-g Apr 2, 2020
085ffa6

adding logic to run docker exec command if not circleci build, else r…


vicky-g Apr 3, 2020
cf10544

adding the fi at end of if else for shell script


vicky-g Apr 3, 2020
2d79177

adding back psql command in package.json


vicky-g Apr 3, 2020
50401a8

adding command -v psql command to check if psql existts


vicky-g Apr 3, 2020
e85aa52

adding changes to identity service too


vicky-g Apr 3, 2020
5ed4703

updating comments


vicky-g Apr 3, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ jobs:
 cd creator-node
 export redisPort=6379
 export spOwnerWallet='yes'
 export isCIBuild=true
 npm run test

 test-discovery-provider:
Expand DownExpand Up@@ -370,6 +371,7 @@ jobs:
 cd identity-service/
 export POSTGRES_TEST_PORT=5432
 export redisPort=6379
 export isCIBuild=true
 npm run test

 docker-build-and-push:
Expand Down

5 changes: 2 additions & 3 deletions
creator-node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,9 @@
 "start": "nodemon src/index.js | ./node_modules/.bin/bunyan || exit 0",
 "test": "./scripts/run-tests.sh",
 "coverage": "nyc npm run test",
 "report": "nyc report --reporter=html",
 "report": "nyc report --reporter=html",
 "lint": "./node_modules/.bin/standard",
 "lint-fix": "./node_modules/.bin/standard --fix",
 "psql": "psql -U postgres -h localhost -p 4432 -d audius_creator_node"
 "lint-fix": "./node_modules/.bin/standard --fix"
 },
 "keywords": [],
 "author": "",
Expand Down

13 changes: 10 additions & 3 deletions
creator-node/scripts/run-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,12 +14,19 @@ export logLevel='info'

# Locally, the docker-compose files set up a database named audius_creator_node. For
# tests, we use audius_creator_node_test. The below block checks if
# audius_creator_node_test exists, and if not, creates it (the tests will fail if this
# audius_creator_node_test exists in creator node 1, and if not, creates it (the tests will fail if this
# database does not exist). If psql is not installed (ex. in CircleCI), this command will
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_creator_node_test instead of
# audius_creator_node.
if [ -x "$(command -v psql)" ]; then
# audius_creator_node. 

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build. 
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
 docker exec -i audius-creator-node_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_creator_node_test\""
elif [ -x "$(command -v psql)" ]; then
 # taken from https://stackoverflow.com/a/36591842
 psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_creator_node_test"
fi
Expand Down

11 changes: 9 additions & 2 deletions
identity-service/scripts/run-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,15 @@ export logLevel='debug' #should be error
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_identity_service_test instead of
# audius_identity_service.
if [ -x "$(command -v psql)" ]; then

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build. 
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
 # taken from https://stackoverflow.com/a/36591842
 docker exec -i audius-identity-service_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_identity_service_test\""
elif [ -x "$(command -v psql)" ]; then
 psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_identity_service_test"
fi

Expand All@@ -33,4 +40,4 @@ fi

 # linter

npm run lint
npm run lint

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
removed local psql call#349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

vicky-g
merged 8 commits into

from

Apr 3, 2020
 Merged


removed local psql call
#349
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
4c44330

replacing local psql call to check db existence with psql call within…


vicky-g Mar 31, 2020
666b54d

testing setup_remote_docker property to fix ci error


vicky-g Apr 2, 2020
085ffa6

adding logic to run docker exec command if not circleci build, else r…


vicky-g Apr 3, 2020
cf10544

adding the fi at end of if else for shell script


vicky-g Apr 3, 2020
2d79177

adding back psql command in package.json


vicky-g Apr 3, 2020
50401a8

adding command -v psql command to check if psql existts


vicky-g Apr 3, 2020
e85aa52

adding changes to identity service too


vicky-g Apr 3, 2020
5ed4703

updating comments


vicky-g Apr 3, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ jobs:
 cd creator-node
 export redisPort=6379
 export spOwnerWallet='yes'
 export isCIBuild=true
 npm run test

 test-discovery-provider:
Expand DownExpand Up@@ -370,6 +371,7 @@ jobs:
 cd identity-service/
 export POSTGRES_TEST_PORT=5432
 export redisPort=6379
 export isCIBuild=true
 npm run test

 docker-build-and-push:
Expand Down

5 changes: 2 additions & 3 deletions
creator-node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,9 @@
 "start": "nodemon src/index.js | ./node_modules/.bin/bunyan || exit 0",
 "test": "./scripts/run-tests.sh",
 "coverage": "nyc npm run test",
 "report": "nyc report --reporter=html",
 "report": "nyc report --reporter=html",
 "lint": "./node_modules/.bin/standard",
 "lint-fix": "./node_modules/.bin/standard --fix",
 "psql": "psql -U postgres -h localhost -p 4432 -d audius_creator_node"
 "lint-fix": "./node_modules/.bin/standard --fix"
 },
 "keywords": [],
 "author": "",
Expand Down

13 changes: 10 additions & 3 deletions
creator-node/scripts/run-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,12 +14,19 @@ export logLevel='info'

# Locally, the docker-compose files set up a database named audius_creator_node. For
# tests, we use audius_creator_node_test. The below block checks if
# audius_creator_node_test exists, and if not, creates it (the tests will fail if this
# audius_creator_node_test exists in creator node 1, and if not, creates it (the tests will fail if this
# database does not exist). If psql is not installed (ex. in CircleCI), this command will
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_creator_node_test instead of
# audius_creator_node.
if [ -x "$(command -v psql)" ]; then
# audius_creator_node. 

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build. 
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
 docker exec -i audius-creator-node_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_creator_node_test\""
elif [ -x "$(command -v psql)" ]; then
 # taken from https://stackoverflow.com/a/36591842
 psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_creator_node_test"
fi
Expand Down

11 changes: 9 additions & 2 deletions
identity-service/scripts/run-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,15 @@ export logLevel='debug' #should be error
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_identity_service_test instead of
# audius_identity_service.
if [ -x "$(command -v psql)" ]; then

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build. 
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
 # taken from https://stackoverflow.com/a/36591842
 docker exec -i audius-identity-service_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_identity_service_test\""
elif [ -x "$(command -v psql)" ]; then
 psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_identity_service_test"
fi

Expand All@@ -33,4 +40,4 @@ fi

 # linter

npm run lint
npm run lint

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
removed local psql call#349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

vicky-g
merged 8 commits into

from

Apr 3, 2020
 Merged


removed local psql call
#349
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
4c44330

replacing local psql call to check db existence with psql call within…


vicky-g Mar 31, 2020
666b54d

testing setup_remote_docker property to fix ci error


vicky-g Apr 2, 2020
085ffa6

adding logic to run docker exec command if not circleci build, else r…


vicky-g Apr 3, 2020
cf10544

adding the fi at end of if else for shell script


vicky-g Apr 3, 2020
2d79177

adding back psql command in package.json


vicky-g Apr 3, 2020
50401a8

adding command -v psql command to check if psql existts


vicky-g Apr 3, 2020
e85aa52

adding changes to identity service too


vicky-g Apr 3, 2020
5ed4703

updating comments


vicky-g Apr 3, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ jobs:
 cd creator-node
 export redisPort=6379
 export spOwnerWallet='yes'
 export isCIBuild=true
 npm run test

 test-discovery-provider:
Expand DownExpand Up@@ -370,6 +371,7 @@ jobs:
 cd identity-service/
 export POSTGRES_TEST_PORT=5432
 export redisPort=6379
 export isCIBuild=true
 npm run test

 docker-build-and-push:
Expand Down

5 changes: 2 additions & 3 deletions
creator-node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,9 @@
 "start": "nodemon src/index.js | ./node_modules/.bin/bunyan || exit 0",
 "test": "./scripts/run-tests.sh",
 "coverage": "nyc npm run test",
 "report": "nyc report --reporter=html",
 "report": "nyc report --reporter=html",
 "lint": "./node_modules/.bin/standard",
 "lint-fix": "./node_modules/.bin/standard --fix",
 "psql": "psql -U postgres -h localhost -p 4432 -d audius_creator_node"
 "lint-fix": "./node_modules/.bin/standard --fix"
 },
 "keywords": [],
 "author": "",
Expand Down

13 changes: 10 additions & 3 deletions
creator-node/scripts/run-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,12 +14,19 @@ export logLevel='info'

# Locally, the docker-compose files set up a database named audius_creator_node. For
# tests, we use audius_creator_node_test. The below block checks if
# audius_creator_node_test exists, and if not, creates it (the tests will fail if this
# audius_creator_node_test exists in creator node 1, and if not, creates it (the tests will fail if this
# database does not exist). If psql is not installed (ex. in CircleCI), this command will
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_creator_node_test instead of
# audius_creator_node.
if [ -x "$(command -v psql)" ]; then
# audius_creator_node. 

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build. 
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
 docker exec -i audius-creator-node_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_creator_node_test\""
elif [ -x "$(command -v psql)" ]; then
 # taken from https://stackoverflow.com/a/36591842
 psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_creator_node_test"
fi
Expand Down

11 changes: 9 additions & 2 deletions
identity-service/scripts/run-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,15 @@ export logLevel='debug' #should be error
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_identity_service_test instead of
# audius_identity_service.
if [ -x "$(command -v psql)" ]; then

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build. 
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
 # taken from https://stackoverflow.com/a/36591842
 docker exec -i audius-identity-service_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_identity_service_test\""
elif [ -x "$(command -v psql)" ]; then
 psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_identity_service_test"
fi

Expand All@@ -33,4 +40,4 @@ fi

 # linter

npm run lint
npm run lint

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
removed local psql call#349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

vicky-g
merged 8 commits into

from

Apr 3, 2020
 Merged


removed local psql call
#349
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
4c44330

replacing local psql call to check db existence with psql call within…


vicky-g Mar 31, 2020
666b54d

testing setup_remote_docker property to fix ci error


vicky-g Apr 2, 2020
085ffa6

adding logic to run docker exec command if not circleci build, else r…


vicky-g Apr 3, 2020
cf10544

adding the fi at end of if else for shell script


vicky-g Apr 3, 2020
2d79177

adding back psql command in package.json


vicky-g Apr 3, 2020
50401a8

adding command -v psql command to check if psql existts


vicky-g Apr 3, 2020
e85aa52

adding changes to identity service too


vicky-g Apr 3, 2020
5ed4703

updating comments


vicky-g Apr 3, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ jobs:
 cd creator-node
 export redisPort=6379
 export spOwnerWallet='yes'
 export isCIBuild=true
 npm run test

 test-discovery-provider:
Expand DownExpand Up@@ -370,6 +371,7 @@ jobs:
 cd identity-service/
 export POSTGRES_TEST_PORT=5432
 export redisPort=6379
 export isCIBuild=true
 npm run test

 docker-build-and-push:
Expand Down

5 changes: 2 additions & 3 deletions
creator-node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,9 @@
 "start": "nodemon src/index.js | ./node_modules/.bin/bunyan || exit 0",
 "test": "./scripts/run-tests.sh",
 "coverage": "nyc npm run test",
 "report": "nyc report --reporter=html",
 "report": "nyc report --reporter=html",
 "lint": "./node_modules/.bin/standard",
 "lint-fix": "./node_modules/.bin/standard --fix",
 "psql": "psql -U postgres -h localhost -p 4432 -d audius_creator_node"
 "lint-fix": "./node_modules/.bin/standard --fix"
 },
 "keywords": [],
 "author": "",
Expand Down

13 changes: 10 additions & 3 deletions
creator-node/scripts/run-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,12 +14,19 @@ export logLevel='info'

# Locally, the docker-compose files set up a database named audius_creator_node. For
# tests, we use audius_creator_node_test. The below block checks if
# audius_creator_node_test exists, and if not, creates it (the tests will fail if this
# audius_creator_node_test exists in creator node 1, and if not, creates it (the tests will fail if this
# database does not exist). If psql is not installed (ex. in CircleCI), this command will
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_creator_node_test instead of
# audius_creator_node.
if [ -x "$(command -v psql)" ]; then
# audius_creator_node. 

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build. 
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
 docker exec -i audius-creator-node_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_creator_node_test\""
elif [ -x "$(command -v psql)" ]; then
 # taken from https://stackoverflow.com/a/36591842
 psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_creator_node_test"
fi
Expand Down

11 changes: 9 additions & 2 deletions
identity-service/scripts/run-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,15 @@ export logLevel='debug' #should be error
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_identity_service_test instead of
# audius_identity_service.
if [ -x "$(command -v psql)" ]; then

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build. 
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
 # taken from https://stackoverflow.com/a/36591842
 docker exec -i audius-identity-service_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_identity_service_test\""
elif [ -x "$(command -v psql)" ]; then
 psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_identity_service_test"
fi

Expand All@@ -33,4 +40,4 @@ fi

 # linter

npm run lint
npm run lint

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
removed local psql call#349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

vicky-g
merged 8 commits into

from

Apr 3, 2020
 Merged


removed local psql call
#349
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
4c44330

replacing local psql call to check db existence with psql call within…


vicky-g Mar 31, 2020
666b54d

testing setup_remote_docker property to fix ci error


vicky-g Apr 2, 2020
085ffa6

adding logic to run docker exec command if not circleci build, else r…


vicky-g Apr 3, 2020
cf10544

adding the fi at end of if else for shell script


vicky-g Apr 3, 2020
2d79177

adding back psql command in package.json


vicky-g Apr 3, 2020
50401a8

adding command -v psql command to check if psql existts


vicky-g Apr 3, 2020
e85aa52

adding changes to identity service too


vicky-g Apr 3, 2020
5ed4703

updating comments


vicky-g Apr 3, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ jobs:
 cd creator-node
 export redisPort=6379
 export spOwnerWallet='yes'
 export isCIBuild=true
 npm run test

 test-discovery-provider:
Expand DownExpand Up@@ -370,6 +371,7 @@ jobs:
 cd identity-service/
 export POSTGRES_TEST_PORT=5432
 export redisPort=6379
 export isCIBuild=true
 npm run test

 docker-build-and-push:
Expand Down

5 changes: 2 additions & 3 deletions
creator-node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,9 @@
 "start": "nodemon src/index.js | ./node_modules/.bin/bunyan || exit 0",
 "test": "./scripts/run-tests.sh",
 "coverage": "nyc npm run test",
 "report": "nyc report --reporter=html",
 "report": "nyc report --reporter=html",
 "lint": "./node_modules/.bin/standard",
 "lint-fix": "./node_modules/.bin/standard --fix",
 "psql": "psql -U postgres -h localhost -p 4432 -d audius_creator_node"
 "lint-fix": "./node_modules/.bin/standard --fix"
 },
 "keywords": [],
 "author": "",
Expand Down

13 changes: 10 additions & 3 deletions
creator-node/scripts/run-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,12 +14,19 @@ export logLevel='info'

# Locally, the docker-compose files set up a database named audius_creator_node. For
# tests, we use audius_creator_node_test. The below block checks if
# audius_creator_node_test exists, and if not, creates it (the tests will fail if this
# audius_creator_node_test exists in creator node 1, and if not, creates it (the tests will fail if this
# database does not exist). If psql is not installed (ex. in CircleCI), this command will
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_creator_node_test instead of
# audius_creator_node.
if [ -x "$(command -v psql)" ]; then
# audius_creator_node. 

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build. 
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
 docker exec -i audius-creator-node_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_creator_node_test\""
elif [ -x "$(command -v psql)" ]; then
 # taken from https://stackoverflow.com/a/36591842
 psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_creator_node_test"
fi
Expand Down

11 changes: 9 additions & 2 deletions
identity-service/scripts/run-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,15 @@ export logLevel='debug' #should be error
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_identity_service_test instead of
# audius_identity_service.
if [ -x "$(command -v psql)" ]; then

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build. 
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
 # taken from https://stackoverflow.com/a/36591842
 docker exec -i audius-identity-service_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_identity_service_test\""
elif [ -x "$(command -v psql)" ]; then
 psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_identity_service_test"
fi

Expand All@@ -33,4 +40,4 @@ fi

 # linter

npm run lint
npm run lint

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
removed local psql call#349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

vicky-g
merged 8 commits into

from

Apr 3, 2020
 Merged


removed local psql call
#349
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
4c44330

replacing local psql call to check db existence with psql call within…


vicky-g Mar 31, 2020
666b54d

testing setup_remote_docker property to fix ci error


vicky-g Apr 2, 2020
085ffa6

adding logic to run docker exec command if not circleci build, else r…


vicky-g Apr 3, 2020
cf10544

adding the fi at end of if else for shell script


vicky-g Apr 3, 2020
2d79177

adding back psql command in package.json


vicky-g Apr 3, 2020
50401a8

adding command -v psql command to check if psql existts


vicky-g Apr 3, 2020
e85aa52

adding changes to identity service too


vicky-g Apr 3, 2020
5ed4703

updating comments


vicky-g Apr 3, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 2 additions & 0 deletions
.circleci/config.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,6 +250,7 @@ jobs:
 cd creator-node
 export redisPort=6379
 export spOwnerWallet='yes'
 export isCIBuild=true
 npm run test

 test-discovery-provider:
Expand DownExpand Up@@ -370,6 +371,7 @@ jobs:
 cd identity-service/
 export POSTGRES_TEST_PORT=5432
 export redisPort=6379
 export isCIBuild=true
 npm run test

 docker-build-and-push:
Expand Down

5 changes: 2 additions & 3 deletions
creator-node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,9 @@
 "start": "nodemon src/index.js | ./node_modules/.bin/bunyan || exit 0",
 "test": "./scripts/run-tests.sh",
 "coverage": "nyc npm run test",
 "report": "nyc report --reporter=html",
 "report": "nyc report --reporter=html",
 "lint": "./node_modules/.bin/standard",
 "lint-fix": "./node_modules/.bin/standard --fix",
 "psql": "psql -U postgres -h localhost -p 4432 -d audius_creator_node"
 "lint-fix": "./node_modules/.bin/standard --fix"
 },
 "keywords": [],
 "author": "",
Expand Down

13 changes: 10 additions & 3 deletions
creator-node/scripts/run-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,12 +14,19 @@ export logLevel='info'

# Locally, the docker-compose files set up a database named audius_creator_node. For
# tests, we use audius_creator_node_test. The below block checks if
# audius_creator_node_test exists, and if not, creates it (the tests will fail if this
# audius_creator_node_test exists in creator node 1, and if not, creates it (the tests will fail if this
# database does not exist). If psql is not installed (ex. in CircleCI), this command will
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_creator_node_test instead of
# audius_creator_node.
if [ -x "$(command -v psql)" ]; then
# audius_creator_node. 

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build. 
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
 docker exec -i audius-creator-node_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_creator_node_test\""
elif [ -x "$(command -v psql)" ]; then
 # taken from https://stackoverflow.com/a/36591842
 psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_creator_node_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_creator_node_test"
fi
Expand Down

11 changes: 9 additions & 2 deletions
identity-service/scripts/run-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,8 +23,15 @@ export logLevel='debug' #should be error
# fail, so we check if it is installed first.
# In CircleCI, the docker environment variables set up audius_identity_service_test instead of
# audius_identity_service.
if [ -x "$(command -v psql)" ]; then

# CircleCI job and docker run in separate environments and cannot directly communicate with each other.
# Therefore the 'docker exec' command will not work when running the CI build. 
# https://circleci.com/docs/2.0/building-docker-images/#separation-of-environments
# So, if tests are run locally, run docker exec command. Else, run the psql command in the job.
if [ -z "${isCIBuild}" ]; then
 # taken from https://stackoverflow.com/a/36591842
 docker exec -i audius-identity-service_db_1 /bin/sh -c "psql -U postgres -tc \"SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'\" | grep -q 1 || psql -U postgres -c \"CREATE DATABASE audius_identity_service_test\""
elif [ -x "$(command -v psql)" ]; then
 psql -U postgres -h localhost -p $PG_PORT -tc "SELECT 1 FROM pg_database WHERE datname = 'audius_identity_service_test'" | grep -q 1 || psql -U postgres -h localhost -p $PG_PORT -c "CREATE DATABASE audius_identity_service_test"
fi

Expand All@@ -33,4 +40,4 @@ fi

 # linter

npm run lint
npm run lint