Skip to content

Commit 8976211

Browse files
straumatstraumat
committed
Merge branch 'release/6.0.0'
2 parents 0d6409d + 04f4d30 commit 8976211

File tree

433 files changed

+12282
-13792
lines changed

Some content is hidden

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

433 files changed

+12282
-13792
lines changed

‎.github/dependabot.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,26 @@ updates:
33
- package-ecosystem: maven
44
directory: "/"
55
schedule:
6-
interval: "daily"
6+
interval: "weekly"
7+
day: "sunday"
78
time: "18:00"
89
timezone: "Europe/Paris"
9-
open-pull-requests-limit: 9
1010
target-branch: development
1111

1212
- package-ecosystem: npm
1313
directory: "/docs"
1414
schedule:
15-
interval: "daily"
15+
interval: "weekly"
16+
day: "sunday"
1617
time: "18:00"
1718
timezone: "Europe/Paris"
18-
open-pull-requests-limit: 9
19-
target-branch: development
19+
target-branch: development
20+
21+
- package-ecosystem: github-actions
22+
directory: "/"
23+
schedule:
24+
interval: "weekly"
25+
day: "sunday"
26+
time: "18:00"
27+
timezone: "Europe/Paris"
28+
target-branch: development

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: CodeQL analysis
22

33
on:
44
schedule:
5-
- cron: '0 18 * * MON'
6-
- cron: '0 18 * * THU'
75
- cron: '0 18 * * SUN'
86

97
jobs:
@@ -12,27 +10,27 @@ jobs:
1210

1311
steps:
1412
# ================================================================================================================
15-
- name: JDK 11 Setup
16-
uses: actions/setup-java@v2
13+
- name: JDK 17 Setup
14+
uses: actions/setup-java@v3.3.0
1715
with:
18-
distribution: 'adopt'
19-
java-version: '11'
16+
distribution: 'temurin'
17+
java-version: '17'
2018

2119
# ================================================================================================================
2220
- name: Retrieve the sources
23-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
2422

2523
# ================================================================================================================
2624
- name: Initialize CodeQL
27-
uses: github/codeql-action/init@v1.0.22
25+
uses: github/codeql-action/init@v2.1.11
2826
with:
2927
languages: java
3028

3129
# ================================================================================================================
3230
- name: Build and package
3331
run: |
34-
mvn package -DskipTests
32+
mvn package -Dgpg.skip -Dmaven.test.skip=true
3533
3634
# ================================================================================================================
3735
- name: Perform CodeQL Analysis
38-
uses: github/codeql-action/analyze@v1.0.22
36+
uses: github/codeql-action/analyze@v2.1.11

‎.github/workflows/integration-tests.yml‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

.github/workflows/branch-push-or-pull-request.yml renamed to .github/workflows/on-branch-push-or-pull-request.yml

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ jobs:
88

99
steps:
1010
# ================================================================================================================
11-
- name: JDK 11 Setup
12-
uses: actions/setup-java@v2
11+
- name: JDK 17 Setup
12+
uses: actions/setup-java@v3.3.0
1313
with:
14-
distribution: 'adopt'
15-
java-version: '11'
14+
distribution: 'temurin'
15+
java-version: '17'
1616

1717
# ================================================================================================================
1818
- name: Retrieve the sources
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020

2121
# ================================================================================================================
2222
- name: Build, run tests and deploy locally
@@ -31,7 +31,10 @@ jobs:
3131
run: |
3232
bash <(curl -Ls https://coverage.codacy.com/get.sh) report \
3333
--project-token ${{ secrets.CODACY_API_TOKEN }} \
34-
-r spring-boot-starter/autoconfigure/target/site/jacoco/jacoco.xml
34+
--language Java \
35+
--coverage-reports spring-boot-starter/autoconfigure/target/site/jacoco/jacoco.xml \
36+
--coverage-reports spring-boot-starter-test/autoconfigure/target/site/jacoco/jacoco.xml \
37+
--coverage-reports spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/target/site/jacoco/jacoco.xml
3538
3639
# ================================================================================================================
3740
- name: Test Cassandre trading bot maven archetype - basic strategy
@@ -47,17 +50,35 @@ jobs:
4750
mvn -f archetype-test-basic/pom.xml test
4851
4952
# ================================================================================================================
50-
- name: Test Cassandre trading bot maven archetype - basic ta4j strategy
53+
- name: Install Go to generate the graphQL documentation with gqldoc
54+
uses: actions/setup-go@v3
55+
with:
56+
go-version: '^1.17.3'
57+
58+
# ================================================================================================================
59+
# - name: Add the GraphQL schema and its documentation to the website
60+
# run: |
61+
# cp spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/*.graphqls docs/docs/.vuepress/public/api/graphql/definition
62+
# go install github.com/Code-Hex/gqldoc/cmd/gqldoc@v0.0.6
63+
# gqldoc -s "docs/docs/.vuepress/public/api/graphql/definition/*.graphqls" -o ./docs/docs/learn/graphql-api-documentation
64+
65+
# ================================================================================================================
66+
- name: Install vuepress, set release number, and build the website
5167
run: |
52-
mvn -B archetype:generate \
53-
-DarchetypeGroupId=tech.cassandre.trading.bot \
54-
-DarchetypeArtifactId=cassandre-trading-bot-spring-boot-starter-basic-ta4j-archetype \
55-
-DarchetypeVersion=${{ steps.maven.outputs.version }} \
56-
-DgroupId=com.example \
57-
-DartifactId=archetype-test-ta4j-basic \
58-
-Dversion=1.0-SNAPSHOT \
59-
-Dpackage=com.example
60-
mvn -f archetype-test-ta4j-basic/pom.xml test
68+
yarn add -D vuepress@next
69+
find . -type f -name "*.md" -exec sed -i 's/CASSANDRE_LATEST_RELEASE/${{ steps.maven.outputs.version }}/g' {} \;
70+
yarn --cwd docs install
71+
yarn --cwd docs docs:build docs
72+
73+
# ================================================================================================================
74+
- name: Deploy the website to github pages
75+
uses: JamesIves/github-pages-deploy-action@v4.3.0
76+
with:
77+
branch: gh-pages
78+
target-folder: beta
79+
folder: docs/docs/.vuepress/dist
80+
commit-message: "Beta website deployment"
81+
clean: false
6182

6283
# ================================================================================================================
6384
# Testing that the graphql starter is working correctly.

.github/workflows/publish-snapshot-and-website.yml renamed to .github/workflows/on-development-push-publish-snapshot-and-website.yml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,30 @@ on:
55
branches:
66
- "development"
77

8+
permissions:
9+
id-token: "write"
10+
contents: "write"
11+
packages: "write"
12+
pull-requests: "read"
13+
814
jobs:
915
build:
1016
runs-on: ubuntu-latest
1117

1218
steps:
1319
# ================================================================================================================
14-
- name: JDK 11 Setup
15-
uses: actions/setup-java@v2
20+
- name: JDK 17 Setup
21+
uses: actions/setup-java@v3.3.0
1622
with:
17-
distribution: 'adopt'
18-
java-version: '11'
23+
distribution: 'temurin'
24+
java-version: '17'
1925
server-id: ossrh
2026
server-username: MAVEN_USERNAME
2127
server-password: MAVEN_PASSWORD
2228

2329
# ================================================================================================================
2430
- name: Retrieve the sources
25-
uses: actions/checkout@v2
31+
uses: actions/checkout@v3
2632

2733
# ================================================================================================================
2834
- name: GPG Setup
@@ -46,23 +52,24 @@ jobs:
4652
4753
# ================================================================================================================
4854
- name: Retrieve the latest release published on Github
49-
uses: pozetroninc/github-action-get-latest-release@v0.5.0
55+
uses: pozetroninc/github-action-get-latest-release@v0.6.0
5056
id: getLatestRelease
5157
with:
5258
repository: ${{ github.repository }}
5359

5460
# ================================================================================================================
5561
- name: Install Go to generate the graphQL documentation with gqldoc
56-
uses: actions/setup-go@v2
62+
uses: actions/setup-go@v3
5763
with:
5864
go-version: '^1.17.3'
5965

6066
# ================================================================================================================
6167
- name: Add the GraphQL schema and its documentation to the website
6268
run: |
6369
cp spring-boot-starter-api/spring-boot-starter-api-graphql/autoconfigure/src/main/resources/schema/*.graphqls docs/docs/.vuepress/public/api/graphql/definition
64-
go install github.com/Code-Hex/gqldoc/cmd/gqldoc@v0.0.4
65-
gqldoc -s "docs/docs/.vuepress/public/api/graphql/definition/*.graphqls" -o ./docs/docs/learn/graphql-api-documentation
70+
go install github.com/Code-Hex/gqldoc/cmd/gqldoc@v0.0.6
71+
gqldoc -s "docs/docs/.vuepress/public/api/graphql/definition/*.graphqls" -o ./docs/docs/tutorial/graphql-api-documentation
72+
gqldoc -s "docs/docs/.vuepress/public/api/graphql/definition/*.graphqls" -o ./docs/docs/fr/tutorial/graphql-api-documentation
6673
6774
# ================================================================================================================
6875
- name: Install vuepress, set release number, and build the website
@@ -74,9 +81,9 @@ jobs:
7481
7582
# ================================================================================================================
7683
- name: Deploy the website to github pages
77-
uses: JamesIves/github-pages-deploy-action@4.1.4
84+
uses: JamesIves/github-pages-deploy-action@v4.3.3
7885
with:
7986
branch: gh-pages
8087
folder: docs/docs/.vuepress/dist
81-
commit-message: "Website update"
88+
commit-message: "Website deployment"
8289
clean: true

.github/workflows/release-creation.yml renamed to .github/workflows/on-tag-push-create-release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ jobs:
1717

1818
steps:
1919
# ================================================================================================================
20-
- name: JDK 11 Setup
21-
uses: actions/setup-java@v2
20+
- name: JDK 17 Setup
21+
uses: actions/setup-java@v3.3.0
2222
with:
23-
distribution: 'adopt'
24-
java-version: '11'
23+
distribution: 'temurin'
24+
java-version: '17'
2525
server-id: ossrh
2626
server-username: MAVEN_USERNAME
2727
server-password: MAVEN_PASSWORD
2828

2929
# ================================================================================================================
3030
- name: Retrieve the sources
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v3
3232

3333
# ================================================================================================================
3434
- name: GPG Setup
@@ -80,7 +80,7 @@ jobs:
8080
# ================================================================================================================
8181
- name: Publish the announce on Discord
8282
continue-on-error: true
83-
uses: Ilshidur/action-discord@0.3.0
83+
uses: Ilshidur/action-discord@0.3.2
8484
env:
8585
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
8686
with:

‎README.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@
4040
</a>
4141
</p>
4242

43-
## ✨ Features
44-
- **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.
45-
- **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).
46-
- **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.
47-
- **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.
48-
- **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.
49-
- **Technical Analysis support**: Cassandre provides a specific class (BasicTa4jCassandreStrategy) to help you build a strategy based on the open source technical analysis library ta4j.
50-
5143
<p align="center">
5244
<a href="https://trading-bot.cassandre.tech/learn/quickstart">Quick Start</a> |
5345
<a href="https://trading-bot.cassandre.tech">Documentation</a> |

‎SECURITY.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
## Supported Versions
44

55
| Version | Supported |
6-
| ------- | ------------------ |
6+
|---------| ------------------ |
7+
| 6.x.x | :white_check_mark: |
78
| 5.x.x | :white_check_mark: |
89
| 4.x.x | :x: |
910
| 3.x.x | :x: |

‎docs/README.md‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
# Web site management.
2-
[https://trading-bot.cassandre.tech/](https://trading-bot.cassandre.tech/)
1+
# Cassandre trading bot
32

4-
## Run the website
5-
```
6-
cd docs
7-
yarn docs:dev
8-
```
3+
## How to run documentation
4+
`yarn docs:dev`

0 commit comments

Comments
 (0)