diff --git a/.doc/repository/REPO-README.md b/.doc/repository/REPO-README.md new file mode 100644 index 0000000..6be9285 --- /dev/null +++ b/.doc/repository/REPO-README.md @@ -0,0 +1,27 @@ +# MineSQL Repository + +采用github的repo分支进行依赖,随项目发布而自动更新。 + +其他依赖方式见主页介绍。 + +## 依赖方式 + +### Maven + +```xml + + + MineSQL + GitHub Branch Repository + https://github.com/CarmJos/MineSQL/blob/repo/ + + +``` + +### Gradle + +```groovy +repositories { + maven { url 'https://github.com/CarmJos/MineSQL/blob/repo/' } +} +``` \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5c02a6c..7d098ff 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,7 +8,7 @@ on: types: [ published ] jobs: - gh-deploy: + packages-deploy: name: "Deploy Project (GitHub)" runs-on: ubuntu-latest @@ -43,6 +43,80 @@ jobs: asset_path: ".asset/*.jar" asset_content_type: application/java-archive + github-deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: "Set up JDK" + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + cache: maven + + - name: "Maven Deploy" + run: mvn -B -Plocal deploy --file pom.xml -DskipTests + + - name: "Copy artifacts" + run: | + rm -rf deploy + mkdir -vp deploy + cp -vrf $HOME/local-deploy/* deploy/ + cp -vrf .documentation/repository/REPO-README.md deploy/README.md + + - name: "Copy Javadoc" + run: | + rm -rf docs + mkdir -vp docs + cp -vrf api/target/apidocs/* docs/ + cp -vrf .documentation/javadoc/JAVADOC-README.md docs/README.md + + - name: "Generate Javadoc sitemap" + id: sitemap + uses: cicirello/generate-sitemap@v1 + with: + base-url-path: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }} + path-to-root: docs + + - name: "Output Javadoc stats" + run: | + echo "sitemap-path = ${{ steps.sitemap.outputs.sitemap-path }}" + echo "url-count = ${{ steps.sitemap.outputs.url-count }}" + echo "excluded-count = ${{ steps.sitemap.outputs.excluded-count }}" + ls -l docs + + - name: "Configure Git" + env: + DEPLOY_PRI: ${{secrets.DEPLOY_PRI}} + run: | + sudo timedatectl set-timezone "Asia/Shanghai" + mkdir -p ~/.ssh/ + echo "$DEPLOY_PRI" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + ssh-keyscan github.com >> ~/.ssh/known_hosts + git config --global user.name '${{ github.repository_owner }}' + git config --global user.email '${{ github.repository_owner }}@users.noreply.github.com' + + - name: "Commit&Push repository files" + run: | + cd deploy + git init + git remote add origin git@github.com:${{ github.repository_owner }}/${{ github.event.repository.name }}.git + git checkout -b repo + git add -A + git commit -m "Maven project deployment." + git push origin HEAD:repo --force + + - name: "Commit&Push API documentation" + run: | + cd docs + git init + git remote add origin git@github.com:${{ github.repository_owner }}/${{ github.event.repository.name }}.git + git checkout -b gh-pages + git add -A + git commit -m "API Document generated." + git push origin HEAD:gh-pages --force + central-deploy: name: "Deploy Project (Central)" runs-on: ubuntu-latest diff --git a/README.md b/README.md index 595c1ee..61d526b 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ ``` # MineSQL (EasySQL-Plugin) + [![version](https://img.shields.io/github/v/release/CarmJos/MineSQL)](https://github.com/CarmJos/MineSQL/releases) [![License](https://img.shields.io/github/license/CarmJos/MineSQL)](https://opensource.org/licenses/GPL-3.0) [![workflow](https://github.com/CarmJos/MineSQL/actions/workflows/maven.yml/badge.svg?branch=master)](https://github.com/CarmJos/MineSQL/actions/workflows/maven.yml) @@ -89,12 +90,12 @@ Properties 文件的文件名几位数据源的ID,允许为英文、数字、 Maven Central https://repo1.maven.org/maven2 - + - + MineSQL - GitHub Packages - https://maven.pkg.github.com/CarmJos/MineSQL + GitHub Branch Repository + https://github.com/CarmJos/MineSQL/blob/repo/ @@ -130,8 +131,8 @@ repositories { //采用Maven中心库,安全稳定,但版本更新需要等待同步 mavenCentral() - // 采用github依赖库,安全稳定,但需要配置 (推荐) - maven { url 'https://maven.pkg.github.com/CarmJos/MineSQL' } + // 采用github分支依赖库,稳定更新快 + maven { url 'https://github.com/CarmJos/MineSQL/blob/repo/' } // 采用我的私人依赖库,简单方便,但可能因为变故而无法使用 maven { url 'https://repo.carm.cc/repository/maven-public/' } @@ -146,7 +147,7 @@ dependencies { ## 指令 -插件主指令为 `/easysql` ,所有指令只允许后台执行。 +插件主指令为 `/minesql` ,所有指令只允许后台执行。 ```text # help diff --git a/api/pom.xml b/api/pom.xml index 50c3fff..5647259 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -5,7 +5,7 @@ minesql-parent cc.carm.plugin - 1.1.0 + 1.1.1 4.0.0 diff --git a/core/pom.xml b/core/pom.xml index defcce6..dc5d85f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ minesql-parent cc.carm.plugin - 1.1.0 + 1.1.1 4.0.0 diff --git a/platforms/bukkit/pom.xml b/platforms/bukkit/pom.xml index 613e285..2952251 100644 --- a/platforms/bukkit/pom.xml +++ b/platforms/bukkit/pom.xml @@ -5,7 +5,7 @@ minesql-parent cc.carm.plugin - 1.1.0 + 1.1.1 ../../pom.xml 4.0.0 diff --git a/platforms/bungee/pom.xml b/platforms/bungee/pom.xml index 60255f9..1f9811b 100644 --- a/platforms/bungee/pom.xml +++ b/platforms/bungee/pom.xml @@ -5,7 +5,7 @@ minesql-parent cc.carm.plugin - 1.1.0 + 1.1.1 ../../pom.xml 4.0.0 diff --git a/platforms/velocity/pom.xml b/platforms/velocity/pom.xml index 3df0bb7..6c1f082 100644 --- a/platforms/velocity/pom.xml +++ b/platforms/velocity/pom.xml @@ -5,7 +5,7 @@ minesql-parent cc.carm.plugin - 1.1.0 + 1.1.1 ../../pom.xml 4.0.0 diff --git a/plugin/pom.xml b/plugin/pom.xml index 14c04f0..c79f9a3 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -5,7 +5,7 @@ minesql-parent cc.carm.plugin - 1.1.0 + 1.1.1 4.0.0 diff --git a/pom.xml b/pom.xml index e7925bc..d7cf44b 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ cc.carm.plugin minesql-parent pom - 1.1.0 + 1.1.1 api core @@ -302,6 +302,19 @@ + + local + + + localRepository + file:${user.home}/local-deploy/ + + + localRepository + file:${user.home}/local-deploy/ + + +