Skip to content

Commit

Permalink
Merge pull request #89 from finmath/develop
Browse files Browse the repository at this point in the history
Merge Develop
  • Loading branch information
cfries authored Sep 17, 2024
2 parents 23fb744 + 50b0732 commit c091ad8
Show file tree
Hide file tree
Showing 247 changed files with 65,430 additions and 2,054 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ jobs:
name: Java 17 build and unit testing
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
- name: Build with Maven
run: mvn -B package --file pom.xml
26 changes: 26 additions & 0 deletions .github/workflows/upload_snapshot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: finmath smart derivative contract

#trigg
#only push new SNAPSHOTS from develop
on:
push:
branches:
- develop

jobs:
bCP1ld:
name: SNAPSHOT, build and upload
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
- name: upload SNAPSHOT to GitLab
env:
DEPLOY_TOKEN: ${{ secrets.DEPLOY_TOKEN }}
PRIVATE_TOKEN: ${{ secrets.PRIVATE_TOKEN }}
run: mvn -s github_SNAPSHOT_settings.xml clean install deploy
continue-on-error: true
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ RUN mvn -f /usr/src/app/pom.xml clean package spring-boot:repackage

# Run Stage: Copy fat-jar and define Entrypoint
FROM openjdk:17 as RunStage
COPY --from=BuildStage /usr/src/app/target/finmath-smart-derivative-contract-1.0.2-SNAPSHOT.jar /usr/app/finmath-smart-derivative-contract-1.0.2-SNAPSHOT.jar
ENTRYPOINT ["java", "-jar", "/usr/app/finmath-smart-derivative-contract-1.0.2-SNAPSHOT.jar"]
COPY --from=BuildStage /usr/src/app/target/finmath-smart-derivative-contract-1.0.7-SNAPSHOT.jar /usr/app/finmath-smart-derivative-contract-1.0.7-SNAPSHOT.jar
ENTRYPOINT ["java", "-jar", "/usr/app/finmath-smart-derivative-contract-1.0.7-SNAPSHOT.jar"]
Loading

0 comments on commit c091ad8

Please sign in to comment.