Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 27 additions & 10 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,36 @@
name: Deploy OPEX - Dev
name: Push images on dev branch update

on:
push:
branches:
- dev

jobs:
jenkinsJob:
name: Build OPEX new dev version
runs-on: ubuntu-latest
build:
runs-on: ubuntu-20.04
strategy:
matrix:
java: [ 11 ]
name: Build OPEX and run tests with java ${{ matrix.java }}
steps:
- name: Trigger opex-build-job on jenkins
uses: appleboy/jenkins-action@master
- name: Checkout Source Code
uses: actions/checkout@v2
- name: Setup Java
uses: actions/setup-java@v2
with:
url: ${{ secrets.JENKINS_URL }}
user: ${{ secrets.JENKINS_USER }}
token: ${{ secrets.JENKINS_TOKEN }}
job: "opex-core-dev-deploy"
distribution: 'adopt'
java-package: jdk
java-version: ${{ matrix.java }}
cache: maven
- name: Build
run: mvn -B -T 1C clean install
- name: Build Docker images
run: TAG=dev docker-compose -f docker-compose.build.yml build
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Push images to GitHub Container Registry
run: TAG=dev docker-compose -f docker-compose.build.yml push
37 changes: 27 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,36 @@
name: Deploy OPEX - Demo
name: Push images on main branch update

on:
push:
branches:
- main

jobs:
jenkinsJob:
name: Deploy OPEX new demo version
runs-on: ubuntu-latest
build:
runs-on: ubuntu-20.04
strategy:
matrix:
java: [ 11 ]
name: Build OPEX and run tests with java ${{ matrix.java }}
steps:
- name: Trigger opex-build-job on jenkins
uses: appleboy/jenkins-action@master
- name: Checkout Source Code
uses: actions/checkout@v2
- name: Setup Java
uses: actions/setup-java@v2
with:
url: ${{ secrets.JENKINS_URL }}
user: ${{ secrets.JENKINS_USER }}
token: ${{ secrets.JENKINS_TOKEN }}
job: "opex-core-demo-deploy"
distribution: 'adopt'
java-package: jdk
java-version: ${{ matrix.java }}
cache: maven
- name: Build
run: mvn -B -T 1C clean install
- name: Build Docker images
run: TAG=latest docker-compose -f docker-compose.build.yml build
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Push images to GitHub Container Registry
run: TAG=latest docker-compose -f docker-compose.build.yml push
11 changes: 6 additions & 5 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build on pull request
name: Build and test on pull request

on:
pull_request:
Expand All @@ -10,7 +10,7 @@ jobs:
strategy:
matrix:
java: [ 11 ]
name: Opex with java ${{ matrix.java }} build
name: Build OPEX and run tests with java ${{ matrix.java }}
steps:
- name: Checkout Source Code
uses: actions/checkout@v2
Expand All @@ -21,6 +21,7 @@ jobs:
java-package: jdk
java-version: ${{ matrix.java }}
cache: maven
- name: Build OPEX-Core
working-directory: .
run: mvn -B clean install
- name: Build
run: mvn -B -T 1C clean install
- name: Build Docker images
run: TAG=latest docker-compose -f docker-compose.build.yml build
72 changes: 0 additions & 72 deletions Jenkinsfile

This file was deleted.

72 changes: 0 additions & 72 deletions dev.Jenkinsfile

This file was deleted.

47 changes: 47 additions & 0 deletions docker-compose.build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
version: '3.8'
services:
vault:
image: ghcr.io/opexdev/vault-opex:$TAG
build: docker-images/vault
postgres-opex:
image: ghcr.io/opexdev/postgres-opex:$TAG
build: docker-images/postgres
accountant:
image: ghcr.io/opexdev/accountant:$TAG
build: accountant/accountant-app
eventlog:
image: ghcr.io/opexdev/eventlog:$TAG
build: eventlog/eventlog-app
matching-engine:
image: ghcr.io/opexdev/matching-engine:$TAG
build: matching-engine/matching-engine-app
matching-gateway:
image: ghcr.io/opexdev/matching-gateway:$TAG
build: matching-gateway/matching-gateway-app
auth:
image: ghcr.io/opexdev/auth:$TAG
build: user-management/keycloak-gateway
wallet:
image: ghcr.io/opexdev/wallet:$TAG
build: wallet/wallet-app
api:
image: ghcr.io/opexdev/api:$TAG
build: api/api-app
websocket:
image: ghcr.io/opexdev/websocket:$TAG
build: websocket/websocket-app
bc-gateway:
image: ghcr.io/opexdev/bc-gateway:$TAG
build: bc-gateway/bc-gateway-app
storage:
image: ghcr.io/opexdev/storage:$TAG
build: storage/storage-app
referral:
image: ghcr.io/opexdev/referral:$TAG
build: referral/referral-app
captcha:
image: ghcr.io/opexdev/captcha:$TAG
build: captcha/captcha-app
admin:
image: ghcr.io/opexdev/admin:$TAG
build: admin/admin-app
34 changes: 0 additions & 34 deletions docker-compose.dev.yml

This file was deleted.

31 changes: 0 additions & 31 deletions docker-compose.override.yml

This file was deleted.

Loading