diff --git a/.documentation/repository/REPO-README.md b/.documentation/repository/REPO-README.md new file mode 100644 index 0000000..b4e39d6 --- /dev/null +++ b/.documentation/repository/REPO-README.md @@ -0,0 +1,27 @@ +# EasyPlugin Repository + +采用github的repo分支进行依赖,随项目发布而自动更新。 + +其他依赖方式见主页介绍。 + +## 依赖方式 + +### Maven + +```xml + + + EasyPlugin + GitHub Branch Repository + https://github.com/CarmJos/EasyPlugin/blob/repo/ + + +``` + +### Gradle + +```groovy +repositories { + maven { url 'https://github.com/CarmJos/EasyPlugin/blob/repo/' } +} +``` \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0bac55b..fe26668 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,7 +1,7 @@ # This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven -name: Project Deployment +name: Deploy & Publish on: # 支持手动触发构建 @@ -11,10 +11,8 @@ on: types: [ published ] jobs: - github-deploy: - + packages-deploy: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v2 - name: "Set up JDK" @@ -34,10 +32,8 @@ jobs: MAVEN_TOKEN: ${{secrets.GITHUB_TOKEN}} - local-deploy: - + github-deploy: runs-on: ubuntu-latest - steps: - uses: actions/checkout@v2 - name: "Set up JDK" @@ -55,45 +51,7 @@ jobs: rm -rf deploy mkdir -vp deploy cp -vrf $HOME/local-deploy/* deploy/ - - - 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 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." - - - name: "Push files" - run: | - cd deploy - git push origin HEAD:repo --force - - javadoc-deploy: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: "Set up JDK" - uses: actions/setup-java@v2 - with: - java-version: '8' - distribution: 'adopt' - cache: maven + cp -vrf .documentation/repository/REPO-README.md deploy/README.md - name: "Generate Javadoc" run: mvn -B javadoc:aggregate --file pom.xml -DskipTests @@ -105,14 +63,14 @@ jobs: cp -vrf target/site/apidocs/* docs/ cp -vrf .documentation/javadoc/JAVADOC-README.md docs/README.md - - name: "Generate Sitemap" + - 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 stats + - name: "Output Javadoc stats" run: | echo "sitemap-path = ${{ steps.sitemap.outputs.sitemap-path }}" echo "url-count = ${{ steps.sitemap.outputs.url-count }}" @@ -131,7 +89,17 @@ jobs: git config --global user.name '${{ github.repository_owner }}' git config --global user.email '${{ github.repository_owner }}@users.noreply.github.com' - - name: "Commit documentation" + - 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 @@ -139,8 +107,4 @@ jobs: git checkout -b gh-pages git add -A git commit -m "API Document generated." - - - name: "Push Javadoc website" - run: | - cd docs - git push origin HEAD:gh-pages --force \ No newline at end of file + git push origin HEAD:gh-pages --force diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d67acd5..63a6f6f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,7 +1,7 @@ # This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven -name: Project Build & Tests +name: Build & Tests on: # 支持手动触发构建 @@ -19,7 +19,7 @@ jobs: uses: actions/setup-java@v2 with: cache: maven - java-version: '11' + java-version: '8' distribution: 'adopt' server-id: github server-username: MAVEN_USERNAME diff --git a/base/command/pom.xml b/base/command/pom.xml index 7a0f579..a5cdfbf 100644 --- a/base/command/pom.xml +++ b/base/command/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.4.4 + 1.4.5 ../../pom.xml 4.0.0 diff --git a/base/gui/pom.xml b/base/gui/pom.xml index a3425c3..7796c63 100644 --- a/base/gui/pom.xml +++ b/base/gui/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.4.4 + 1.4.5 ../../pom.xml 4.0.0 diff --git a/base/main/pom.xml b/base/main/pom.xml index d513780..0b52d1e 100644 --- a/base/main/pom.xml +++ b/base/main/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.4.4 + 1.4.5 ../../pom.xml 4.0.0 diff --git a/collection/all/pom.xml b/collection/all/pom.xml index 9e89d36..421b851 100644 --- a/collection/all/pom.xml +++ b/collection/all/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.4.4 + 1.4.5 ../../pom.xml 4.0.0 diff --git a/collection/bom/pom.xml b/collection/bom/pom.xml index 5deb015..01c1210 100644 --- a/collection/bom/pom.xml +++ b/collection/bom/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.4.4 + 1.4.5 ../../pom.xml 4.0.0 diff --git a/collection/common/pom.xml b/collection/common/pom.xml index fcaae81..83b1ebf 100644 --- a/collection/common/pom.xml +++ b/collection/common/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.4.4 + 1.4.5 ../../pom.xml 4.0.0 diff --git a/extension/papi/pom.xml b/extension/papi/pom.xml index 1b491c1..a95ed75 100644 --- a/extension/papi/pom.xml +++ b/extension/papi/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.4.4 + 1.4.5 ../../pom.xml 4.0.0 diff --git a/extension/vault/pom.xml b/extension/vault/pom.xml index f8c1cf5..4865e72 100644 --- a/extension/vault/pom.xml +++ b/extension/vault/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.4.4 + 1.4.5 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 5e22045..8b4407e 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ cc.carm.lib easyplugin-parent pom - 1.4.4 + 1.4.5 base/main