Skip to content

Commit

Permalink
🔧 update github workflow with staging branch instead of feature branc…
Browse files Browse the repository at this point in the history
…h && 🐛 fix bug with oracle price
  • Loading branch information
Quentin Burg committed Sep 5, 2023
1 parent 0bf9f33 commit fa693fc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/docker-ghostnet-front-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Docker ghostnet front staging
on:
push:
branches:
- '378-upgrade-batcher-ui'
- 'release-ghostnet-staging'
- 'release-ghostnet-beta'
pull_request:
branches:
- '378-upgrade-batcher-ui'
- 'release-ghostnet-staging'
- 'release-ghostnet-beta'
types:
- closed
Expand Down Expand Up @@ -40,13 +40,13 @@ jobs:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push ui version 378-upgrade-batcher-ui
if: github.ref == 'refs/heads/378-upgrade-batcher-ui'
- name: Build and push ui version release-ghostnet-staging
if: github.ref == 'refs/heads/release-ghostnet-staging'
uses: docker/build-push-action@v3
with:
file: ./batcher-ui/Dockerfile.${{ matrix.network }}
context: ./batcher-ui/
push: ${{ github.ref == 'refs/heads/378-upgrade-batcher-ui' }}
push: ${{ github.ref == 'refs/heads/release-ghostnet-staging' }}
tags: |
ghcr.io/marigold-dev/batcher-${{ matrix.network }}:staging
ghcr.io/marigold-dev/batcher-${{ matrix.network }}:${{ steps.vars.outputs.date }}-${{ steps.vars.outputs.sha_short }}-staging
Expand Down
7 changes: 6 additions & 1 deletion batcher-ui/src/reducers/exchange.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
ExchangeActions,
getBatcherStatus,
getCurrentBatchNumber,
getOraclePrice,
getPairsInfos,
getVolumes,
} from '../../src/actions';
Expand Down Expand Up @@ -164,7 +165,11 @@ const exchangeReducer = (
},
},
action.payload.batchNumber
? Cmd.list([Cmd.action(getBatcherStatus()), Cmd.action(getVolumes())])
? Cmd.list([
Cmd.action(getBatcherStatus()),
Cmd.action(getVolumes()),
Cmd.action(getOraclePrice()),
])
: Cmd.none
);
case 'GET_ORACLE_PRICE':
Expand Down

0 comments on commit fa693fc

Please sign in to comment.