From 2dc76d47eafb50a2e73cae6a478b65fa208b1e6a Mon Sep 17 00:00:00 2001 From: "azure-pipelines[bot]" Date: Mon, 28 Jan 2019 22:49:39 +0000 Subject: [PATCH 1/3] Set up CI with Azure Pipelines --- azure-pipelines.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 000000000..002457047 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,21 @@ +# Node.js +# Build a general Node.js project with npm. +# Add steps that analyze code, save build artifacts, deploy, and more: +# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript + +trigger: +- release + +pool: + vmImage: 'vs2017-win2016' + +steps: +- task: NodeTool@0 + inputs: + versionSpec: '9.x' + displayName: 'Install Node.js' + +- script: | + yarn install + yarn build --publish onTag + displayName: 'yarn install and build' -- 2.45.3 From 20e2d8c00adfb7bcb8e4820a2500766499c1bac4 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Tue, 29 Jan 2019 11:46:56 -0500 Subject: [PATCH 2/3] allow updating search api with env --- src/renderer/index.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index 98f9a40c2..0d6847438 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -17,7 +17,7 @@ import { doOpenModal, doHideModal, } from 'redux/actions/app'; -import { doToast, doBlackListedOutpointsSubscribe, isURIValid } from 'lbry-redux'; +import { doToast, doBlackListedOutpointsSubscribe, isURIValid, setSearchApi } from 'lbry-redux'; import { doNavigate } from 'redux/actions/navigation'; import { doDownloadLanguages, doUpdateIsNightAsync } from 'redux/actions/settings'; import { doAuthenticate, Lbryio, rewards } from 'lbryinc'; @@ -37,6 +37,10 @@ if (process.env.LBRY_API_URL) { Lbryio.setLocalApi(process.env.LBRY_API_URL); } +if (process.env.SEARCH_API_URL) { + setSearchApi(process.env.SEARCH_API_URL); +} + // We need to override Lbryio for getting/setting the authToken // We interect with ipcRenderer to get the auth key from a users keyring // We keep a local variable for authToken beacuse `ipcRenderer.send` does not -- 2.45.3 From ae6254d87016e89a4cac223d0f7951e0e9e98748 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Tue, 29 Jan 2019 11:49:03 -0500 Subject: [PATCH 3/3] update lbry-redux --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 99a791adb..54f152200 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "hast-util-sanitize": "^1.1.2", "keytar": "^4.2.1", "lbry-format": "https://github.com/lbryio/lbry-format.git", - "lbry-redux": "lbryio/lbry-redux#2ff9f70a3d765946a1c83c8e7eee7d81c96c1345", + "lbry-redux": "lbryio/lbry-redux#973bbd780a774ba48f4e22861b6accb706cf3835", "lbryinc": "lbryio/lbryinc#83c275da7a44f346ce9e796d06f30126f02b4c63", "localforage": "^1.7.1", "mammoth": "^1.4.6", diff --git a/yarn.lock b/yarn.lock index aedf44d38..a21e9506b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5723,17 +5723,17 @@ lazy-val@^1.0.3: tar-stream "^1.6.2" zstd-codec "^0.1.1" -lbry-redux@lbryio/lbry-redux#2ff9f70a3d765946a1c83c8e7eee7d81c96c1345: +lbry-redux@lbryio/lbry-redux#84b7d396934d57a37802aadbef71db91230a9404: version "0.0.1" - resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/2ff9f70a3d765946a1c83c8e7eee7d81c96c1345" + resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/84b7d396934d57a37802aadbef71db91230a9404" dependencies: proxy-polyfill "0.1.6" reselect "^3.0.0" uuid "^3.3.2" -lbry-redux@lbryio/lbry-redux#84b7d396934d57a37802aadbef71db91230a9404: +lbry-redux@lbryio/lbry-redux#973bbd780a774ba48f4e22861b6accb706cf3835: version "0.0.1" - resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/84b7d396934d57a37802aadbef71db91230a9404" + resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/973bbd780a774ba48f4e22861b6accb706cf3835" dependencies: proxy-polyfill "0.1.6" reselect "^3.0.0" -- 2.45.3