Skip to content

Commit

Permalink
test & fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
jiangtj committed Apr 4, 2023
1 parent d452309 commit 2413d38
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 22 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/mvn-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Deploy

on:
push:
tags:
- "v*.*.*"

jobs:
build:

runs-on: ubuntu-latest

services:
# Label used to access the service container
mariadb:
# Docker Hub image
image: mariadb:10
# Provide the password for postgres
env:
MYSQL_DATABASE: system-db
MYSQL_ROOT_PASSWORD: 123456
CHARACTER_SET_SERVER: utf8mb4
COLLATION_SERVER: utf8mb4_unicode_ci
# Set health checks to wait until postgres has started
# options: >-
# --character-set-server=utf8mb4
# --collation-server=utf8mb4_unicode_ci
ports:
- 3311:3306

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Deploy with Maven
run: mvn deploy
env:
GITHUB_TOKEN: ${{ github.token }}
6 changes: 1 addition & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release & Deploy
name: Release

on:
push:
Expand Down Expand Up @@ -39,10 +39,6 @@ jobs:
cache: maven
- name: Build with Maven
run: mvn package
- name: Deploy with Maven
run: mvn deploy -Dmaven.test.skip=true
env:
GITHUB_TOKEN: ${{ github.token }}
- name: Release
uses: softprops/action-gh-release@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions base-reactive/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<parent>
<groupId>com.jtj.cloud</groupId>
<artifactId>parent</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
</parent>
<artifactId>base-reactive</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
<name>base-reactive</name>
<description>base-reactive</description>

Expand Down
4 changes: 2 additions & 2 deletions base-servlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<parent>
<groupId>com.jtj.cloud</groupId>
<artifactId>parent</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
</parent>
<artifactId>base-servlet</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
<name>base-servlet</name>
<description>base-servlet</description>

Expand Down
4 changes: 2 additions & 2 deletions gateway-session/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>gateway-session</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
<packaging>jar</packaging>

<name>gateway-session</name>
Expand All @@ -13,7 +13,7 @@
<parent>
<groupId>com.jtj.cloud</groupId>
<artifactId>parent</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions micro-auth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<parent>
<groupId>com.jtj.cloud</groupId>
<artifactId>parent</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
</parent>
<artifactId>micro-auth</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
<name>micro-auth</name>
<description>auth-server</description>

Expand Down
4 changes: 2 additions & 2 deletions micro-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<parent>
<groupId>com.jtj.cloud</groupId>
<artifactId>parent</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
</parent>
<artifactId>micro-common</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
<name>micro-common</name>
<description>micro-common</description>

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>com.jtj.cloud</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<version>0.0.2</version>
<version>0.0.3</version>

<parent>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -45,12 +45,12 @@
<dependency>
<groupId>com.jtj.cloud</groupId>
<artifactId>micro-auth</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
</dependency>
<dependency>
<groupId>com.jtj.cloud</groupId>
<artifactId>micro-common</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
Expand Down
4 changes: 2 additions & 2 deletions sba-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>sba-server</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
<packaging>jar</packaging>

<name>sba-server</name>
Expand All @@ -13,7 +13,7 @@
<parent>
<groupId>com.jtj.cloud</groupId>
<artifactId>parent</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
</parent>

<properties>
Expand Down
4 changes: 2 additions & 2 deletions system-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<parent>
<groupId>com.jtj.cloud</groupId>
<artifactId>parent</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
</parent>
<artifactId>system-server</artifactId>
<version>0.0.2</version>
<version>0.0.3</version>
<name>system-server</name>
<description>System Server for cloud management.</description>

Expand Down

0 comments on commit 2413d38

Please sign in to comment.