Skip to content

Commit

Permalink
Merge branch 'release/6.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
straumat committed May 26, 2022
2 parents 0d6409d + 04f4d30 commit 8976211
Show file tree
Hide file tree
Showing 433 changed files with 12,282 additions and 13,792 deletions.
19 changes: 14 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,26 @@ updates:
- package-ecosystem: maven
directory: "/"
schedule:
interval: "daily"
interval: "weekly"
day: "sunday"
time: "18:00"
timezone: "Europe/Paris"
open-pull-requests-limit: 9
target-branch: development

- package-ecosystem: npm
directory: "/docs"
schedule:
interval: "daily"
interval: "weekly"
day: "sunday"
time: "18:00"
timezone: "Europe/Paris"
open-pull-requests-limit: 9
target-branch: development
target-branch: development

- package-ecosystem: github-actions
directory: "/"
schedule:
interval: "weekly"
day: "sunday"
time: "18:00"
timezone: "Europe/Paris"
target-branch: development
18 changes: 8 additions & 10 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: CodeQL analysis

on:
schedule:
- cron: '0 18 * * MON'
- cron: '0 18 * * THU'
- cron: '0 18 * * SUN'

jobs:
Expand All @@ -12,27 +10,27 @@ jobs:

steps:
# ================================================================================================================
- name: JDK 11 Setup
uses: actions/setup-java@v2
- name: JDK 17 Setup
uses: actions/setup-java@v3.3.0
with:
distribution: 'adopt'
java-version: '11'
distribution: 'temurin'
java-version: '17'

# ================================================================================================================
- name: Retrieve the sources
uses: actions/checkout@v2
uses: actions/checkout@v3

# ================================================================================================================
- name: Initialize CodeQL
uses: github/codeql-action/init@v1.0.22
uses: github/codeql-action/init@v2.1.11
with:
languages: java

# ================================================================================================================
- name: Build and package
run: |
mvn package -DskipTests
mvn package -Dgpg.skip -Dmaven.test.skip=true
# ================================================================================================================
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1.0.22
uses: github/codeql-action/analyze@v2.1.11
51 changes: 0 additions & 51 deletions .github/workflows/integration-tests.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ jobs:

steps:
# ================================================================================================================
- name: JDK 11 Setup
uses: actions/setup-java@v2
- name: JDK 17 Setup
uses: actions/setup-java@v3.3.0
with:
distribution: 'adopt'
java-version: '11'
distribution: 'temurin'
java-version: '17'

# ================================================================================================================
- name: Retrieve the sources
uses: actions/checkout@v2
uses: actions/checkout@v3

# ================================================================================================================
- name: Build, run tests and deploy locally
Expand All @@ -31,7 +31,10 @@ jobs:
run: |
bash <(curl -Ls https://coverage.codacy.com/get.sh) report \
--project-token ${{ secrets.CODACY_API_TOKEN }} \
-r spring-boot-starter/autoconfigure/target/site/jacoco/jacoco.xml
--language Java \
--coverage-reports spring-boot-starter/autoconfigure/target/site/jacoco/jacoco.xml \
--coverage-reports spring-boot-starter-test/autoconfigure/target/site/jacoco/jacoco.xml \
--coverage-reports spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/target/site/jacoco/jacoco.xml
# ================================================================================================================
- name: Test Cassandre trading bot maven archetype - basic strategy
Expand All @@ -47,17 +50,35 @@ jobs:
mvn -f archetype-test-basic/pom.xml test
# ================================================================================================================
- name: Test Cassandre trading bot maven archetype - basic ta4j strategy
- name: Install Go to generate the graphQL documentation with gqldoc
uses: actions/setup-go@v3
with:
go-version: '^1.17.3'

# ================================================================================================================
# - name: Add the GraphQL schema and its documentation to the website
# run: |
# cp spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/*.graphqls docs/docs/.vuepress/public/api/graphql/definition
# go install github.com/Code-Hex/gqldoc/cmd/[email protected]
# gqldoc -s "docs/docs/.vuepress/public/api/graphql/definition/*.graphqls" -o ./docs/docs/learn/graphql-api-documentation

# ================================================================================================================
- name: Install vuepress, set release number, and build the website
run: |
mvn -B archetype:generate \
-DarchetypeGroupId=tech.cassandre.trading.bot \
-DarchetypeArtifactId=cassandre-trading-bot-spring-boot-starter-basic-ta4j-archetype \
-DarchetypeVersion=${{ steps.maven.outputs.version }} \
-DgroupId=com.example \
-DartifactId=archetype-test-ta4j-basic \
-Dversion=1.0-SNAPSHOT \
-Dpackage=com.example
mvn -f archetype-test-ta4j-basic/pom.xml test
yarn add -D vuepress@next
find . -type f -name "*.md" -exec sed -i 's/CASSANDRE_LATEST_RELEASE/${{ steps.maven.outputs.version }}/g' {} \;
yarn --cwd docs install
yarn --cwd docs docs:build docs
# ================================================================================================================
- name: Deploy the website to github pages
uses: JamesIves/[email protected]
with:
branch: gh-pages
target-folder: beta
folder: docs/docs/.vuepress/dist
commit-message: "Beta website deployment"
clean: false

# ================================================================================================================
# Testing that the graphql starter is working correctly.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,30 @@ on:
branches:
- "development"

permissions:
id-token: "write"
contents: "write"
packages: "write"
pull-requests: "read"

jobs:
build:
runs-on: ubuntu-latest

steps:
# ================================================================================================================
- name: JDK 11 Setup
uses: actions/setup-java@v2
- name: JDK 17 Setup
uses: actions/setup-java@v3.3.0
with:
distribution: 'adopt'
java-version: '11'
distribution: 'temurin'
java-version: '17'
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD

# ================================================================================================================
- name: Retrieve the sources
uses: actions/checkout@v2
uses: actions/checkout@v3

# ================================================================================================================
- name: GPG Setup
Expand All @@ -46,23 +52,24 @@ jobs:
# ================================================================================================================
- name: Retrieve the latest release published on Github
uses: pozetroninc/github-action-get-latest-release@v0.5.0
uses: pozetroninc/github-action-get-latest-release@v0.6.0
id: getLatestRelease
with:
repository: ${{ github.repository }}

# ================================================================================================================
- name: Install Go to generate the graphQL documentation with gqldoc
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: '^1.17.3'

# ================================================================================================================
- name: Add the GraphQL schema and its documentation to the website
run: |
cp spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/*.graphqls docs/docs/.vuepress/public/api/graphql/definition
go install github.com/Code-Hex/gqldoc/cmd/[email protected]
gqldoc -s "docs/docs/.vuepress/public/api/graphql/definition/*.graphqls" -o ./docs/docs/learn/graphql-api-documentation
go install github.com/Code-Hex/gqldoc/cmd/[email protected]
gqldoc -s "docs/docs/.vuepress/public/api/graphql/definition/*.graphqls" -o ./docs/docs/tutorial/graphql-api-documentation
gqldoc -s "docs/docs/.vuepress/public/api/graphql/definition/*.graphqls" -o ./docs/docs/fr/tutorial/graphql-api-documentation
# ================================================================================================================
- name: Install vuepress, set release number, and build the website
Expand All @@ -74,9 +81,9 @@ jobs:
# ================================================================================================================
- name: Deploy the website to github pages
uses: JamesIves/github-pages-deploy-action@4.1.4
uses: JamesIves/github-pages-deploy-action@v4.3.3
with:
branch: gh-pages
folder: docs/docs/.vuepress/dist
commit-message: "Website update"
commit-message: "Website deployment"
clean: true
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ jobs:

steps:
# ================================================================================================================
- name: JDK 11 Setup
uses: actions/setup-java@v2
- name: JDK 17 Setup
uses: actions/setup-java@v3.3.0
with:
distribution: 'adopt'
java-version: '11'
distribution: 'temurin'
java-version: '17'
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD

# ================================================================================================================
- name: Retrieve the sources
uses: actions/checkout@v2
uses: actions/checkout@v3

# ================================================================================================================
- name: GPG Setup
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
# ================================================================================================================
- name: Publish the announce on Discord
continue-on-error: true
uses: Ilshidur/[email protected].0
uses: Ilshidur/[email protected].2
env:
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
with:
Expand Down
8 changes: 0 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,6 @@
</a>
</p>

## ✨ Features
- **Get into trading with minimum fuss**: Available as a Spring boot starter, Cassandre takes care of exchange connection, accounts, orders, trades, and positions, so you can focus on building your strategy.
- **Create your strategy in minutes**: Just code when you want to create short/long positions, set the rules, and we take care of everything (buying, selling, rules management, orders, trades, and tickers).
- **Several exchanges supported**: Cassandre uses XChange library to connect to multiple exchanges. We test each Cassandre releases with Kucoin, Coinbase & Binance to be sure it works for you.
- **Dry mode**: We provide a dry mode to simulate a virtual exchange replying to your orders, so you can easily test your strategy. This way, you can simulate your gains/loss over a period of time.
- **Backtesting**: We provide a spring boot starter to backtest your bot on historical data. With this, during tests, Cassandre will import your data and push them to your strategy.
- **Technical Analysis support**: Cassandre provides a specific class (BasicTa4jCassandreStrategy) to help you build a strategy based on the open source technical analysis library ta4j.

<p align="center">
<a href="https://trading-bot.cassandre.tech/learn/quickstart">Quick Start</a> |
<a href="https://trading-bot.cassandre.tech">Documentation</a> |
Expand Down
3 changes: 2 additions & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
## Supported Versions

| Version | Supported |
| ------- | ------------------ |
|---------| ------------------ |
| 6.x.x | :white_check_mark: |
| 5.x.x | :white_check_mark: |
| 4.x.x | :x: |
| 3.x.x | :x: |
Expand Down
10 changes: 3 additions & 7 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# Web site management.
[https://trading-bot.cassandre.tech/](https://trading-bot.cassandre.tech/)
# Cassandre trading bot

## Run the website
```
cd docs
yarn docs:dev
```
## How to run documentation
`yarn docs:dev`
Loading

0 comments on commit 8976211

Please sign in to comment.