Skip to content

Commit

Permalink
Update palisade with compound-components commit hash and updated port…
Browse files Browse the repository at this point in the history
…s call to pass in project Id.
  • Loading branch information
torreyatcitty committed Jun 27, 2023
1 parent 7b2072f commit 6c222c4
Show file tree
Hide file tree
Showing 6 changed files with 978 additions and 470 deletions.
150 changes: 75 additions & 75 deletions .github/workflows/build-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,90 +6,90 @@ jobs:
name: Build
runs-on: ubuntu-latest
steps:
- name: Build Note for ${{ github.ref }}
run: |
echo Building ${GITHUB_REF}...
- name: Build Note for ${{ github.ref }}
run: |
echo Building ${GITHUB_REF}...
- name: Checkout repository
uses: actions/checkout@v2
- name: Checkout repository
uses: actions/checkout@v2

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: '15.x'
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: '15.x'

- name: Cache Node Modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
# yarn cache files are stored in `~/.cache` on Linux/macOS
path: ~/.cache
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Cache Node Modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
# yarn cache files are stored in `~/.cache` on Linux/macOS
path: ~/.cache
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Cache Elm Stuff
uses: actions/cache@v2
env:
cache-name: cache-elm-stuff
with:
path: elm-stuff
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/elm.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Cache Elm Stuff
uses: actions/cache@v2
env:
cache-name: cache-elm-stuff
with:
path: elm-stuff
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/elm.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Install Yarn Dependencies
run: |
yarn install --ignore-optional --ignore-platform || ( \
echo "Yarn install failed, cleaning cache" && \
yarn cache clean && \
echo "Trying yarn install again..." \
&& yarn install --ignore-optional --ignore-platform
)
- name: Install Yarn Dependencies
run: |
yarn install --ignore-optional --ignore-platform || ( \
echo "Yarn install failed, cleaning cache" && \
yarn cache clean && \
echo "Trying yarn install again..." \
&& yarn install --ignore-optional --ignore-platform
)
- name: Build Translations
run: |
yarn i18n
- name: Build Translations
run: |
yarn i18n
- name: Build CSS
run: |
yarn build-css
- name: Build CSS
run: |
yarn build-css
- name: Build JavaScript
run:
yarn build
env:
DATA_PROVIDERS: ${{ secrets.DATA_PROVIDERS }}
BLOCKNATIVE_API_KEY: ${{ secrets.BLOCKNATIVE_API_KEY }}
- name: Build JavaScript
run: yarn build
env:
DATA_PROVIDERS: ${{ secrets.DATA_PROVIDERS }}
BLOCKNATIVE_API_KEY: ${{ secrets.BLOCKNATIVE_API_KEY }}
WALLET_CONNECT_PROJECT_ID: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}

- name: Archive App
uses: actions/upload-artifact@v1
with:
name: build
path: build
- name: Archive App
uses: actions/upload-artifact@v1
with:
name: build
path: build

- name: Deploy to IPFS
run: |
yarn --silent deploy-ipfs | tee .release-notes
env:
IPFS_AUTH: ${{ secrets.IPFS_AUTH }}
IPFS_HOST: ${{ secrets.IPFS_HOST }}
- name: Deploy to IPFS
run: |
yarn --silent deploy-ipfs | tee .release-notes
env:
IPFS_AUTH: ${{ secrets.IPFS_AUTH }}
IPFS_HOST: ${{ secrets.IPFS_HOST }}

- name: Upload IPFS Release Artifact
uses: actions/upload-artifact@v1
with:
name: .release
path: .release
- name: Upload IPFS Release Artifact
uses: actions/upload-artifact@v1
with:
name: .release
path: .release

- name: Add Deploy Comment
uses: machine-learning-apps/pr-comment@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
path: .release-notes
if: ${{ github.event_name == 'pull_request' }}
- name: Add Deploy Comment
uses: machine-learning-apps/pr-comment@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
path: .release-notes
if: ${{ github.event_name == 'pull_request' }}
12 changes: 8 additions & 4 deletions config/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,18 @@ if (process.env['BLOCKNATIVE_API_KEY']) {
envConfig.BLOCKNATIVE_API_KEY = process.env['BLOCKNATIVE_API_KEY'];
}

if (process.env['WALLET_CONNECT_PROJECT_ID']) {
envConfig.WALLET_CONNECT_PROJECT_ID = process.env['WALLET_CONNECT_PROJECT_ID'];
}

if (process.env['DATA_PROVIDERS']) {
try {
envConfig.DATA_PROVIDERS = JSON.parse(process.env['DATA_PROVIDERS']);
} catch (e) {
console.error("");
console.error("Error: DATA_PROVIDERS provided but is not valid JSON");
console.error("");
console.error("");
console.error('');
console.error('Error: DATA_PROVIDERS provided but is not valid JSON');
console.error('');
console.error('');
throw e;
}
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"chalk": "^4.0.0",
"clean-webpack-plugin": "^3.0.0",
"cli-table": "0.3.1",
"compound-components": "https://github.com/compound-finance/compound-components.git#e1734102d56ffa14727f10435c68288d9f058a6d",
"compound-components": "https://github.com/compound-finance/compound-components.git#5d361c2baf76b45ff8eff83b3ed74bcf4d119c55",
"compound-config": "https://github.com/compound-finance/compound-config.git#ff8e979ffcb286d09884163cc928688f213abe71",
"connect-history-api-fallback": "^1.5.0",
"core-js": "3",
Expand Down
3 changes: 2 additions & 1 deletion src/js/dapp.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ window.addEventListener('load', function () {
configFiles,
configAbiFiles,
configNameToAddressMappings,
process.env.BLOCKNATIVE_API_KEY
process.env.BLOCKNATIVE_API_KEY,
process.env.WALLET_CONNECT_PROJECT_ID
);
});
Loading

0 comments on commit 6c222c4

Please sign in to comment.