From ef5204688b83d11026a9252fa93a283365eafeee Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Wed, 9 Mar 2022 10:40:42 +0800 Subject: [PATCH] pre commit 2.8.15 --- .env | 2 +- .github/workflows/build.yml | 32 +++++++++++++++++++ .github/workflows/package-testing.yml | 2 +- docs/js/version.js | 2 +- docs/version.txt | 2 +- docs/versions.json | 6 ++-- modules/agent/pom.xml | 4 +-- modules/common/pom.xml | 4 +-- .../common/src/main/resources/jpom-logo.txt | 2 +- modules/server/DockerfileRelease | 2 +- modules/server/pom.xml | 4 +-- .../sub-plugin/auto-charset-jchardet/pom.xml | 2 +- modules/sub-plugin/db-h2/pom.xml | 2 +- modules/sub-plugin/docker-cli/pom.xml | 2 +- modules/sub-plugin/email/pom.xml | 2 +- modules/sub-plugin/git-clone/pom.xml | 2 +- modules/sub-plugin/maven-plugin/pom.xml | 2 +- modules/sub-plugin/pom.xml | 4 +-- modules/sub-plugin/svn-clone/pom.xml | 2 +- modules/sub-plugin/webhook/pom.xml | 2 +- pom.xml | 2 +- script/docker.sh | 4 +-- web-vue/package.json | 2 +- 23 files changed, 61 insertions(+), 29 deletions(-) create mode 100644 .github/workflows/build.yml diff --git a/.env b/.env index 17841735f..b9419cb1b 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -JPOM_VERSION=2.8.14 +JPOM_VERSION=2.8.15 # Server Token 生产部署请更换 SERVER_TOKEN=7094f673-2c53-4fc1-82e7-86e528449d97 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..4a0e526d0 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,32 @@ +name: build + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + + build: + + runs-on: ubuntu-latest + strategy: + matrix: + node-version: [ 16.x ] + # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v2 + with: + node-version: ${{ matrix.node-version }} + - run: cd web-vue && npm i && npm run build + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: mvn -B package diff --git a/.github/workflows/package-testing.yml b/.github/workflows/package-testing.yml index b30b149aa..7f6c60c59 100644 --- a/.github/workflows/package-testing.yml +++ b/.github/workflows/package-testing.yml @@ -39,5 +39,5 @@ jobs: #file: ./zhuzhu-project/target/site/jacoco/jacoco.xml # run: | # docker buildx create --use -# docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.14 -f ./modules/server/DockerfileRelease --push . +# docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.15 -f ./modules/server/DockerfileRelease --push . # docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push . diff --git a/docs/js/version.js b/docs/js/version.js index 4d50122e9..dff10ecdc 100644 --- a/docs/js/version.js +++ b/docs/js/version.js @@ -1 +1 @@ -var version = '2.8.14'; +var version = '2.8.15'; diff --git a/docs/version.txt b/docs/version.txt index 63cb62ffd..92e6e77a2 100644 --- a/docs/version.txt +++ b/docs/version.txt @@ -1 +1 @@ -2.8.14 +2.8.15 diff --git a/docs/versions.json b/docs/versions.json index da0621519..c857132ca 100644 --- a/docs/versions.json +++ b/docs/versions.json @@ -1,6 +1,6 @@ { - "tag_name": "v2.8.14", - "agentUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/agent-2.8.14-release.zip", - "serverUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/server-2.8.14-release.zip", + "tag_name": "v2.8.15", + "agentUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/agent-2.8.15-release.zip", + "serverUrl": "https://jpom-releases.oss-cn-hangzhou.aliyuncs.com/server-2.8.15-release.zip", "changelogUrl": "https://gitee.com/dromara/Jpom/raw/master/CHANGELOG.md" } diff --git a/modules/agent/pom.xml b/modules/agent/pom.xml index 92b0062a6..b097dbcc5 100644 --- a/modules/agent/pom.xml +++ b/modules/agent/pom.xml @@ -29,12 +29,12 @@ jpom-parent io.jpom - 2.8.14 + 2.8.15 ../../pom.xml 4.0.0 agent - 2.8.14 + 2.8.15 Jpom Agent io.jpom.JpomAgentApplication diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 603f223d9..c5ef5e0a8 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -29,13 +29,13 @@ jpom-parent io.jpom - 2.8.14 + 2.8.15 ../../pom.xml 4.0.0 Jpom Common common - 2.8.14 + 2.8.15 diff --git a/modules/common/src/main/resources/jpom-logo.txt b/modules/common/src/main/resources/jpom-logo.txt index 823d382ba..a1c15042d 100644 --- a/modules/common/src/main/resources/jpom-logo.txt +++ b/modules/common/src/main/resources/jpom-logo.txt @@ -7,4 +7,4 @@ | | |_| - ➜ Jpom \ (•◡•) / (v2.8.14) \ No newline at end of file + ➜ Jpom \ (•◡•) / (v2.8.15) \ No newline at end of file diff --git a/modules/server/DockerfileRelease b/modules/server/DockerfileRelease index b68fcf960..31ffca9a1 100644 --- a/modules/server/DockerfileRelease +++ b/modules/server/DockerfileRelease @@ -24,7 +24,7 @@ FROM maven:3.8.4-jdk-8 ENV JPOM_HOME /usr/local/jpom-server -ENV JPOM_PKG server-2.8.14-release.tar.gz +ENV JPOM_PKG server-2.8.15-release.tar.gz ENV JPOM_DATA_PATH ${JPOM_HOME}/data ENV JPOM_LOG_PATH ${JPOM_HOME}/log diff --git a/modules/server/pom.xml b/modules/server/pom.xml index ec31f3ace..ceed6dc76 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -29,13 +29,13 @@ jpom-parent io.jpom - 2.8.14 + 2.8.15 ../../pom.xml 4.0.0 Jpom Server server - 2.8.14 + 2.8.15 io.jpom.JpomServerApplication diff --git a/modules/sub-plugin/auto-charset-jchardet/pom.xml b/modules/sub-plugin/auto-charset-jchardet/pom.xml index 1f2605563..76e8ecd43 100644 --- a/modules/sub-plugin/auto-charset-jchardet/pom.xml +++ b/modules/sub-plugin/auto-charset-jchardet/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent io.jpom.plugins - 2.8.14 + 2.8.15 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/db-h2/pom.xml b/modules/sub-plugin/db-h2/pom.xml index 106e66de5..259b706dd 100644 --- a/modules/sub-plugin/db-h2/pom.xml +++ b/modules/sub-plugin/db-h2/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent io.jpom.plugins - 2.8.14 + 2.8.15 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/docker-cli/pom.xml b/modules/sub-plugin/docker-cli/pom.xml index f1b28a7b2..196b808b4 100644 --- a/modules/sub-plugin/docker-cli/pom.xml +++ b/modules/sub-plugin/docker-cli/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent io.jpom.plugins - 2.8.14 + 2.8.15 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/email/pom.xml b/modules/sub-plugin/email/pom.xml index 26b6bf7b5..ffc63fcb9 100644 --- a/modules/sub-plugin/email/pom.xml +++ b/modules/sub-plugin/email/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent io.jpom.plugins - 2.8.14 + 2.8.15 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/git-clone/pom.xml b/modules/sub-plugin/git-clone/pom.xml index 09f9aaf38..1064da56f 100644 --- a/modules/sub-plugin/git-clone/pom.xml +++ b/modules/sub-plugin/git-clone/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent io.jpom.plugins - 2.8.14 + 2.8.15 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/maven-plugin/pom.xml b/modules/sub-plugin/maven-plugin/pom.xml index 78873c1ab..12e4d0512 100644 --- a/modules/sub-plugin/maven-plugin/pom.xml +++ b/modules/sub-plugin/maven-plugin/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent io.jpom.plugins - 2.8.14 + 2.8.15 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/pom.xml b/modules/sub-plugin/pom.xml index 04b3fe16e..adbd87989 100644 --- a/modules/sub-plugin/pom.xml +++ b/modules/sub-plugin/pom.xml @@ -29,7 +29,7 @@ jpom-parent io.jpom - 2.8.14 + 2.8.15 ../../pom.xml pom @@ -44,7 +44,7 @@ git-clone 4.0.0 - 2.8.14 + 2.8.15 io.jpom.plugins jpom-plugins-parent Jpom Plugins diff --git a/modules/sub-plugin/svn-clone/pom.xml b/modules/sub-plugin/svn-clone/pom.xml index d3dc679cd..65d83b893 100644 --- a/modules/sub-plugin/svn-clone/pom.xml +++ b/modules/sub-plugin/svn-clone/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent io.jpom.plugins - 2.8.14 + 2.8.15 ../pom.xml 4.0.0 diff --git a/modules/sub-plugin/webhook/pom.xml b/modules/sub-plugin/webhook/pom.xml index c6c059464..ee099fbf9 100644 --- a/modules/sub-plugin/webhook/pom.xml +++ b/modules/sub-plugin/webhook/pom.xml @@ -29,7 +29,7 @@ jpom-plugins-parent io.jpom.plugins - 2.8.14 + 2.8.15 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index fdefa2f80..ef4f73c9b 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ 简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件 2017 - 2.8.14 + 2.8.15 https://gitee.com/dromara/Jpom UTF-8 diff --git a/script/docker.sh b/script/docker.sh index 099a9803f..34f20a5e8 100644 --- a/script/docker.sh +++ b/script/docker.sh @@ -6,12 +6,12 @@ # https://hub.docker.com/r/jpomdocker/jpom # 服务端 -docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.14 -f ./modules/server/DockerfileRelease --push . +docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:2.8.15 -f ./modules/server/DockerfileRelease --push . # docker buildx build --platform linux/amd64,linux/arm64 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push . # docker logs --tail="100" jpom-server -# docker run -d -p 2122:2122 --name jpom-server -v /etc/localtime:/etc/localtime:ro -v jpom-server-vol:/usr/local/jpom-server jpomdocker/jpom:mac-arm-2.8.14 +# docker run -d -p 2122:2122 --name jpom-server -v /etc/localtime:/etc/localtime:ro -v jpom-server-vol:/usr/local/jpom-server jpomdocker/jpom:mac-arm-2.8.15 # docker stop jpom-server # docker rm jpom-server # docker exec -it jpom-server /bin/bash diff --git a/web-vue/package.json b/web-vue/package.json index b0395d677..c1d7fe92c 100644 --- a/web-vue/package.json +++ b/web-vue/package.json @@ -1,6 +1,6 @@ { "name": "jpom-vue", - "version": "2.8.14", + "version": "2.8.15", "private": true, "scripts": { "serve": "vue-cli-service --max-old-space-size=900 serve --mode dev",