Skip to content

Commit

Permalink
Merge pull request #155 from bitfinexcom/beta
Browse files Browse the repository at this point in the history
Release version 3.7.3
  • Loading branch information
ezewer authored Jul 12, 2022
2 parents eb8fd9b + 2f3326a commit 95675a2
Show file tree
Hide file tree
Showing 52 changed files with 1,707 additions and 1,080 deletions.
16 changes: 7 additions & 9 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
.idea
.vscode
**/node_modules
**/.env
**/.env.example
*Dockerfile*
*docker-compose*
lastCommit.json
dist
bfx-reports-framework/db/*.db
bfx-reports-framework/db/*.json
bfx-reports-framework/config/*.json
Expand All @@ -9,12 +16,3 @@ bfx-reports-framework/csv
bfx-report-ui/build
bfx-report-ui/bfx-report-express/logs/*.log
bfx-report-ui/bfx-report-express/config/*.json
docker-compose.yaml
Dockerfile.ui-builder
Dockerfile.linux-builder
Dockerfile.win-builder
Dockerfile.mac-builder
dist
.env.example
lastCommit.json
.vscode
6 changes: 4 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
BRANCH=master
DB_DRIVER=better-sqlite
REPO_BRANCH=master
IS_BFX_API_STAGING=0
IS_DEV_ENV=0
EP_GH_IGNORE_TIME=true
97 changes: 97 additions & 0 deletions .github/workflows/build-electron-app.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
name: build-electron-app

permissions:
contents: write

on:
push:
branches:
- master
pull_request:
branches:
- master
workflow_dispatch:

env:
DOCKER_BUILDKIT: 1
COMPOSE_DOCKER_CLI_BUILD: 1

jobs:
linux-win-docker-builder:
timeout-minutes: 90
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
with:
submodules: recursive
- name: Cache Docker images
uses: ScribeMD/[email protected]
env:
cache-name: docker-images-cache-v1
with:
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Dockerfile**', 'docker-compose.yaml') }}
- name: Cache Electron binaries
id: electron-cache
uses: actions/cache@v3
env:
cache-name: electron-cache-v1
with:
path: |
~/.cache/electron
~/.cache/electron-builder
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('package.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
- name: Build release
id: release-builder
uses: nick-fields/retry@v2
continue-on-error: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
timeout_minutes: 20
retry_wait_seconds: 10
max_attempts: 3
retry_on: any
command: ./scripts/launch.sh -lwp
- name: Prepare cache folders
run: |
sudo chown -R $(id -u):$(id -g) ~/.cache/electron
sudo chown -R $(id -u):$(id -g) ~/.cache/electron-builder
mac-builder:
timeout-minutes: 90
runs-on: macos-11
steps:
- name: Checkout
uses: actions/checkout@v3
with:
submodules: recursive
- uses: actions/setup-node@v3
with:
node-version: 14.16.0
- name: Cache Electron binaries
id: electron-cache
uses: actions/cache@v3
env:
cache-name: electron-cache-v1
with:
path: |
~/Library/Caches/electron
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('package.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
- name: Build release
id: release-builder
uses: nick-fields/retry@v2
continue-on-error: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ELECTRON_CACHE: ~/Library/Caches/electron
with:
timeout_minutes: 20
retry_wait_seconds: 10
max_attempts: 3
retry_on: any
command: ./scripts/build-release.sh -mp
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ dist/*
package-lock.json
.env
lastCommit.json
build/linux-launcher/launcher
build/linux-launcher/*.o
electronEnv.json
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,26 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [3.7.3] - 2022-07-08

### Added

- Go to a specific date on the candles chart [bfx-report-ui#527](https://github.com/bitfinexcom/bfx-report-ui/pull/527)
- 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)

### Changed

- Changes is calendar. Picked timezone its also used in the calendar [bfx-report-ui#529](https://github.com/bitfinexcom/bfx-report-ui/pull/529)
- Charts prices representation now has thousands separator [bfx-report-ui#523](https://github.com/bitfinexcom/bfx-report-ui/pull/523)
- 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)


### Fixed

- UI dependencies verification [bfx-report-ui#526](https://github.com/bitfinexcom/bfx-report-ui/pull/526)
- Fixes removing and adding sub accounts [bfx-report-framework#225](https://github.com/bitfinexcom/bfx-report-framework/pull/225)
- Fixes sub-account recalculation [bfx-report-framework#223](https://github.com/bitfinexcom/bfx-report-framework/pull/223)

## [3.7.2] - 2022-06-01

### Added
Expand Down
13 changes: 8 additions & 5 deletions Dockerfile.linux-builder
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
FROM electronuserland/builder:14

ENV NODE_VERSION 14.16.0
ARG NODE_VERSION="14.16.0"

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

RUN ./scripts/install-nodejs.sh $NODE_VERSION \
COPY ./scripts/helpers/install-nodejs.sh ./scripts/helpers/install-nodejs.sh

RUN ./scripts/helpers/install-nodejs.sh ${NODE_VERSION} \
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
p7zip-full \
Expand All @@ -14,5 +17,5 @@ RUN ./scripts/install-nodejs.sh $NODE_VERSION \

COPY . .

ENTRYPOINT ["./scripts/init.sh"]
CMD ["-p", "linux", "-u"]
ENTRYPOINT ["./scripts/build-release.sh"]
CMD ["-l"]
13 changes: 8 additions & 5 deletions Dockerfile.mac-builder
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
FROM electronuserland/builder:14

ENV NODE_VERSION 14.16.0
ARG NODE_VERSION="14.16.0"

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

RUN ./scripts/install-nodejs.sh $NODE_VERSION \
COPY ./scripts/helpers/install-nodejs.sh ./scripts/helpers/install-nodejs.sh

RUN ./scripts/helpers/install-nodejs.sh ${NODE_VERSION} \
&& apt-get update -y \
&& apt-get install -y --no-install-recommends \
p7zip-full \
Expand All @@ -14,5 +17,5 @@ RUN ./scripts/install-nodejs.sh $NODE_VERSION \

COPY . .

ENTRYPOINT ["./scripts/init.sh"]
CMD ["-p", "mac", "-u"]
ENTRYPOINT ["./scripts/build-release.sh"]
CMD ["-m"]
10 changes: 6 additions & 4 deletions Dockerfile.ui-builder
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
FROM electronuserland/builder:14

ENV NODE_VERSION 14.16.0
ARG NODE_VERSION="14.16.0"

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

RUN ./scripts/install-nodejs.sh $NODE_VERSION
COPY ./scripts/helpers/install-nodejs.sh ./scripts/helpers/install-nodejs.sh

RUN ./scripts/helpers/install-nodejs.sh ${NODE_VERSION}

COPY . .

ENTRYPOINT ["./scripts/build-ui.sh"]
CMD ["-i"]
13 changes: 8 additions & 5 deletions Dockerfile.win-builder
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
FROM electronuserland/builder:14-wine

ENV NODE_VERSION 14.16.0
ARG NODE_VERSION="14.16.0"

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

RUN ./scripts/install-nodejs.sh $NODE_VERSION \
COPY ./scripts/helpers/install-nodejs.sh ./scripts/helpers/install-nodejs.sh

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

COPY . .

ENTRYPOINT ["./scripts/init.sh"]
CMD ["-p", "win", "-u"]
ENTRYPOINT ["./scripts/build-release.sh"]
CMD ["-w"]
Loading

0 comments on commit 95675a2

Please sign in to comment.