From 1957e1be5602aeeca333d2080c455a53e344321b Mon Sep 17 00:00:00 2001 From: Bernardo-MG Date: Sun, 12 Feb 2023 15:02:05 +0100 Subject: [PATCH] Updated CI files --- .github/workflows/deployment.yml | 4 ++-- .github/workflows/doc_deployment.yml | 30 ++++++++++++++++++++++++ .github/workflows/test.yml | 34 ++++++++-------------------- 3 files changed, 41 insertions(+), 27 deletions(-) create mode 100644 .github/workflows/doc_deployment.yml diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 20237c5..3b48e4e 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -7,13 +7,13 @@ on: jobs: github: name: Github - uses: Bernardo-MG/github-workflow/.github/workflows/maven_deploy_github.yml@v1 + uses: Bernardo-MG/github-workflow-maven/.github/workflows/deploy_github.yml@v1 secrets: token: ${{ secrets.GITHUB_TOKEN }} ossrh: name: OSSRH - uses: Bernardo-MG/github-workflow/.github/workflows/maven_deploy_signed.yml@v1 + uses: Bernardo-MG/github-workflow-maven/.github/workflows/deploy_signed.yml@v1 secrets: username: ${{ secrets.OSSRH_USERNAME }} password: ${{ secrets.OSSRH_TOKEN }} diff --git a/.github/workflows/doc_deployment.yml b/.github/workflows/doc_deployment.yml new file mode 100644 index 0000000..e11d382 --- /dev/null +++ b/.github/workflows/doc_deployment.yml @@ -0,0 +1,30 @@ +name: Doc deployment + +on: + push: + branches: + - master + - develop + +jobs: + deploy_develop_docs: + name: Deploy docs for develop + uses: Bernardo-MG/github-workflow-maven/.github/workflows/deploy_site.yml@v1 + with: + branch: develop + host: docs.bernardomg.com + secrets: + url: ${{ secrets.DEPLOY_DOCS_DEVELOP_SITE }} + username: ${{ secrets.DEPLOY_DOCS_DEVELOP_USER }} + password: ${{ secrets.DEPLOY_DOCS_DEVELOP_PASSWORD }} + + deploy_master_docs: + name: Deploy docs for master + uses: Bernardo-MG/github-workflow-maven/.github/workflows/deploy_site.yml@v1 + with: + branch: master + host: docs.bernardomg.com + secrets: + url: ${{ secrets.DEPLOY_DOCS_SITE }} + username: ${{ secrets.DEPLOY_DOCS_USER }} + password: ${{ secrets.DEPLOY_DOCS_PASSWORD }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4fb90e8..3987f7d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,32 +1,16 @@ -name: Tests and docs +name: Tests on: [push, pull_request] jobs: - tests: - name: Tests - uses: Bernardo-MG/github-workflow/.github/workflows/maven_testing.yml@v1 - - deploy_develop_docs: - name: Deploy development docs - needs: tests - uses: Bernardo-MG/github-workflow/.github/workflows/maven_deploy_site.yml@v1 + tests_11: + name: Tests with JDK 11 + uses: Bernardo-MG/github-workflow-maven/.github/workflows/testing.yml@v1 with: - branch: develop - host: docs.bernardomg.com - secrets: - url: ${{ secrets.DEPLOY_DOCS_DEVELOP_SITE }} - username: ${{ secrets.DEPLOY_DOCS_DEVELOP_USER }} - password: ${{ secrets.DEPLOY_DOCS_DEVELOP_PASSWORD }} + jdk: 11 - deploy_docs: - name: Deploy docs - needs: tests - uses: Bernardo-MG/github-workflow/.github/workflows/maven_deploy_site.yml@v1 + tests_17: + name: Tests with JDK 17 + uses: Bernardo-MG/github-workflow-maven/.github/workflows/testing.yml@v1 with: - branch: master - host: docs.bernardomg.com - secrets: - url: ${{ secrets.DEPLOY_DOCS_SITE }} - username: ${{ secrets.DEPLOY_DOCS_USER }} - password: ${{ secrets.DEPLOY_DOCS_PASSWORD }} \ No newline at end of file + jdk: 17