Skip to content

Commit 95675a2

Browse files
ezewerezewer
authored
Merge pull request #155 from bitfinexcom/beta
Release version 3.7.3
2 parents eb8fd9b + 2f3326a commit 95675a2

52 files changed

Lines changed: 1707 additions & 1080 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dockerignore‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1+
.idea
2+
.vscode
13
**/node_modules
24
**/.env
5+
**/.env.example
6+
*Dockerfile*
7+
*docker-compose*
8+
lastCommit.json
9+
dist
310
bfx-reports-framework/db/*.db
411
bfx-reports-framework/db/*.json
512
bfx-reports-framework/config/*.json
@@ -9,12 +16,3 @@ bfx-reports-framework/csv
916
bfx-report-ui/build
1017
bfx-report-ui/bfx-report-express/logs/*.log
1118
bfx-report-ui/bfx-report-express/config/*.json
12-
docker-compose.yaml
13-
Dockerfile.ui-builder
14-
Dockerfile.linux-builder
15-
Dockerfile.win-builder
16-
Dockerfile.mac-builder
17-
dist
18-
.env.example
19-
lastCommit.json
20-
.vscode

‎.env.example‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
BRANCH=master
2-
DB_DRIVER=better-sqlite
1+
REPO_BRANCH=master
2+
IS_BFX_API_STAGING=0
3+
IS_DEV_ENV=0
4+
EP_GH_IGNORE_TIME=true

‎.github/workflows/build-electron-app.yml‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
name: build-electron-app
2+
3+
permissions:
4+
contents: write
5+
6+
on:
7+
push:
8+
branches:
9+
- master
10+
pull_request:
11+
branches:
12+
- master
13+
workflow_dispatch:
14+
15+
env:
16+
DOCKER_BUILDKIT: 1
17+
COMPOSE_DOCKER_CLI_BUILD: 1
18+
19+
jobs:
20+
linux-win-docker-builder:
21+
timeout-minutes: 90
22+
runs-on: ubuntu-20.04
23+
steps:
24+
- name: Checkout
25+
uses: actions/checkout@v3
26+
with:
27+
submodules: recursive
28+
- name: Cache Docker images
29+
uses: ScribeMD/docker-cache@0.1.4
30+
env:
31+
cache-name: docker-images-cache-v1
32+
with:
33+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Dockerfile**', 'docker-compose.yaml') }}
34+
- name: Cache Electron binaries
35+
id: electron-cache
36+
uses: actions/cache@v3
37+
env:
38+
cache-name: electron-cache-v1
39+
with:
40+
path: |
41+
~/.cache/electron
42+
~/.cache/electron-builder
43+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('package.json') }}
44+
restore-keys: |
45+
${{ runner.os }}-build-${{ env.cache-name }}-
46+
- name: Build release
47+
id: release-builder
48+
uses: nick-fields/retry@v2
49+
continue-on-error: false
50+
env:
51+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
52+
with:
53+
timeout_minutes: 20
54+
retry_wait_seconds: 10
55+
max_attempts: 3
56+
retry_on: any
57+
command: ./scripts/launch.sh -lwp
58+
- name: Prepare cache folders
59+
run: |
60+
sudo chown -R $(id -u):$(id -g) ~/.cache/electron
61+
sudo chown -R $(id -u):$(id -g) ~/.cache/electron-builder
62+
63+
mac-builder:
64+
timeout-minutes: 90
65+
runs-on: macos-11
66+
steps:
67+
- name: Checkout
68+
uses: actions/checkout@v3
69+
with:
70+
submodules: recursive
71+
- uses: actions/setup-node@v3
72+
with:
73+
node-version: 14.16.0
74+
- name: Cache Electron binaries
75+
id: electron-cache
76+
uses: actions/cache@v3
77+
env:
78+
cache-name: electron-cache-v1
79+
with:
80+
path: |
81+
~/Library/Caches/electron
82+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('package.json') }}
83+
restore-keys: |
84+
${{ runner.os }}-build-${{ env.cache-name }}-
85+
- name: Build release
86+
id: release-builder
87+
uses: nick-fields/retry@v2
88+
continue-on-error: false
89+
env:
90+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
91+
ELECTRON_CACHE: ~/Library/Caches/electron
92+
with:
93+
timeout_minutes: 20
94+
retry_wait_seconds: 10
95+
max_attempts: 3
96+
retry_on: any
97+
command: ./scripts/build-release.sh -mp

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ dist/*
1111
package-lock.json
1212
.env
1313
lastCommit.json
14-
build/linux-launcher/launcher
15-
build/linux-launcher/*.o
14+
electronEnv.json

‎CHANGELOG.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,26 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [3.7.3] - 2022-07-08
9+
10+
### Added
11+
12+
- Go to a specific date on the candles chart [bfx-report-ui#527](https://github.com/bitfinexcom/bfx-report-ui/pull/527)
13+
- Add order metadata to csv [bfx-report#264](https://github.com/bitfinexcom/bfx-report/pull/264) and [bfx-report-framework#226](https://github.com/bitfinexcom/bfx-report-framework/pull/226)
14+
15+
### Changed
16+
17+
- Changes is calendar. Picked timezone its also used in the calendar [bfx-report-ui#529](https://github.com/bitfinexcom/bfx-report-ui/pull/529)
18+
- Charts prices representation now has thousands separator [bfx-report-ui#523](https://github.com/bitfinexcom/bfx-report-ui/pull/523)
19+
- Increase limit in candles sync for speed improment [bfx-report#262](https://github.com/bitfinexcom/bfx-report/pull/262) and [bfx-report-framework#224](https://github.com/bitfinexcom/bfx-report-framework/pull/224)
20+
21+
22+
### Fixed
23+
24+
- UI dependencies verification [bfx-report-ui#526](https://github.com/bitfinexcom/bfx-report-ui/pull/526)
25+
- Fixes removing and adding sub accounts [bfx-report-framework#225](https://github.com/bitfinexcom/bfx-report-framework/pull/225)
26+
- Fixes sub-account recalculation [bfx-report-framework#223](https://github.com/bitfinexcom/bfx-report-framework/pull/223)
27+
828
## [3.7.2] - 2022-06-01
929

1030
### Added

‎Dockerfile.linux-builder‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
FROM electronuserland/builder:14
22

3-
ENV NODE_VERSION 14.16.0
3+
ARG NODE_VERSION="14.16.0"
44

5-
COPY ./scripts/install-nodejs.sh ./scripts/install-nodejs.sh
5+
ENV IS_BFX_API_STAGING=${IS_BFX_API_STAGING:-0}
6+
ENV IS_DEV_ENV=${IS_DEV_ENV:-0}
67

7-
RUN ./scripts/install-nodejs.sh $NODE_VERSION \
8+
COPY ./scripts/helpers/install-nodejs.sh ./scripts/helpers/install-nodejs.sh
9+
10+
RUN ./scripts/helpers/install-nodejs.sh ${NODE_VERSION} \
811
&& apt-get update -y \
912
&& apt-get install -y --no-install-recommends \
1013
p7zip-full \
@@ -14,5 +17,5 @@ RUN ./scripts/install-nodejs.sh $NODE_VERSION \
1417

1518
COPY . .
1619

17-
ENTRYPOINT ["./scripts/init.sh"]
18-
CMD ["-p", "linux", "-u"]
20+
ENTRYPOINT ["./scripts/build-release.sh"]
21+
CMD ["-l"]

‎Dockerfile.mac-builder‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
FROM electronuserland/builder:14
22

3-
ENV NODE_VERSION 14.16.0
3+
ARG NODE_VERSION="14.16.0"
44

5-
COPY ./scripts/install-nodejs.sh ./scripts/install-nodejs.sh
5+
ENV IS_BFX_API_STAGING=${IS_BFX_API_STAGING:-0}
6+
ENV IS_DEV_ENV=${IS_DEV_ENV:-0}
67

7-
RUN ./scripts/install-nodejs.sh $NODE_VERSION \
8+
COPY ./scripts/helpers/install-nodejs.sh ./scripts/helpers/install-nodejs.sh
9+
10+
RUN ./scripts/helpers/install-nodejs.sh ${NODE_VERSION} \
811
&& apt-get update -y \
912
&& apt-get install -y --no-install-recommends \
1013
p7zip-full \
@@ -14,5 +17,5 @@ RUN ./scripts/install-nodejs.sh $NODE_VERSION \
1417

1518
COPY . .
1619

17-
ENTRYPOINT ["./scripts/init.sh"]
18-
CMD ["-p", "mac", "-u"]
20+
ENTRYPOINT ["./scripts/build-release.sh"]
21+
CMD ["-m"]

‎Dockerfile.ui-builder‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
FROM electronuserland/builder:14
22

3-
ENV NODE_VERSION 14.16.0
3+
ARG NODE_VERSION="14.16.0"
44

5-
COPY ./scripts/install-nodejs.sh ./scripts/install-nodejs.sh
5+
ENV IS_BFX_API_STAGING=${IS_BFX_API_STAGING:-0}
6+
ENV IS_DEV_ENV=${IS_DEV_ENV:-0}
67

7-
RUN ./scripts/install-nodejs.sh $NODE_VERSION
8+
COPY ./scripts/helpers/install-nodejs.sh ./scripts/helpers/install-nodejs.sh
9+
10+
RUN ./scripts/helpers/install-nodejs.sh ${NODE_VERSION}
811

912
COPY . .
1013

1114
ENTRYPOINT ["./scripts/build-ui.sh"]
12-
CMD ["-i"]

‎Dockerfile.win-builder‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
FROM electronuserland/builder:14-wine
22

3-
ENV NODE_VERSION 14.16.0
3+
ARG NODE_VERSION="14.16.0"
44

5-
COPY ./scripts/install-nodejs.sh ./scripts/install-nodejs.sh
5+
ENV IS_BFX_API_STAGING=${IS_BFX_API_STAGING:-0}
6+
ENV IS_DEV_ENV=${IS_DEV_ENV:-0}
67

7-
RUN ./scripts/install-nodejs.sh $NODE_VERSION \
8+
COPY ./scripts/helpers/install-nodejs.sh ./scripts/helpers/install-nodejs.sh
9+
10+
RUN ./scripts/helpers/install-nodejs.sh ${NODE_VERSION} \
811
# Remove the `Wine` source entry to resolve
912
# the release key expiration issue for `apt-get update`
1013
&& sed -i '/Wine/d' /etc/apt/sources.list \
@@ -17,5 +20,5 @@ RUN ./scripts/install-nodejs.sh $NODE_VERSION \
1720

1821
COPY . .
1922

20-
ENTRYPOINT ["./scripts/init.sh"]
21-
CMD ["-p", "win", "-u"]
23+
ENTRYPOINT ["./scripts/build-release.sh"]
24+
CMD ["-w"]

0 commit comments

Comments
 (0)