From afe61b767248fda03a6f879075a4d19ecf72f1f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Kilchenmann?= Date: Thu, 14 Jan 2021 08:48:20 +0100 Subject: [PATCH] chore(gh-ci): fix issue in the release process (#1782) * docs: update CHANGELOG * chore(gh-ci): update release-please * chore(gh): update PR template * chore(gh-ci): deploy docs * chore(gh-ci): deploy docs on release only --- .github/pull_request_template.md | 2 +- .github/workflows/main.yml | 43 +++++++++++++++++++++----------- CHANGELOG.md | 14 +++-------- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index fdb1090f33..adee87ee25 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,5 +1,5 @@ ===REMOVE=== -Important! Please follow the new guideline for setting the Pull Request title: https://docs.dasch.swiss/developers/dsp/contribution/#pull-request-guidelines +Important! Please follow the new guidelines for naming Pull Requests: https://docs.dasch.swiss/developers/dsp/contribution/#pull-request-guidelines ===REMOVE=== resolves DSP- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b08c5a5db..718ccdd243 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -307,6 +307,7 @@ jobs: with: token: ${{ secrets.GH_TOKEN }} release-type: simple + package-name: dsp-api changelog-types: '[{"type": "feat","section": "Enhancements","hidden": false }, {"type": "fix","section": "Bug Fixes","hidden": false }, {"type": "chore","section": "Maintenance","hidden": false }, {"type": "docs","section": "Documentation","hidden": false }]' @@ -389,17 +390,31 @@ jobs: runs-on: ubuntu-latest if: github.event_name == 'release' && startsWith(github.ref, 'refs/tags') steps: - - name: Checkout main - uses: actions/checkout@v1 - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r docs/requirements.txt - npm install --global typedoc - npm install --global @bazel/bazelisk - sudo apt-get install graphviz - - name: Deploy docs - uses: mhausenblas/mkdocs-deploy-gh-pages@master - env: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} - CUSTOM_DOMAIN: docs.knora.org + - name: Checkout main + uses: actions/checkout@v2 + with: + fetch-depth: 1 + - name: Set up Python 3.8 + uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Set up Node + uses: actions/setup-node@v1 + with: + node-version: '12' + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r docs/requirements.txt + npm install --global typedoc + npm install --global @bazel/bazelisk + sudo apt-get install graphviz + - name: Deploy docs + uses: mhausenblas/mkdocs-deploy-gh-pages@master + env: + GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + CUSTOM_DOMAIN: docs.knora.org + - name: Disk Free After + run: | + df -h + docker system df diff --git a/CHANGELOG.md b/CHANGELOG.md index 5372732a7b..18e80ef2d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,8 @@ # Changelog -## Next release (01/01/1970) - -## Maintenance - -- #1773 DSP-667 CI is failing to test upgrade correctly -- #1761 DSP-1099 Update Bazel maven rules to see if it fixes problems with macOS Big Sur -- #1772 chore(rdf-api): Use the Jena RDF API implementation by default (DSP-1153) - ---- ## [13.0.0](https://www.github.com/dasch-swiss/dsp-api/compare/v12.0.0...v13.0.0) (2021-01-11) - ### ⚠ BREAKING CHANGES * New features and refactoring (#1779) @@ -40,6 +30,7 @@ * **test:** Fix typos in IRIs in anything-data.ttl. ([#1625](https://www.github.com/dasch-swiss/dsp-api/issues/1625)) ([23d51ce](https://www.github.com/dasch-swiss/dsp-api/commit/23d51ce5aaf789336e942c01df902943e7e70fca)) * **upgrade:** Fix log output. ([#1774](https://www.github.com/dasch-swiss/dsp-api/issues/1774)) ([b43fab0](https://www.github.com/dasch-swiss/dsp-api/commit/b43fab029995467af2f56a380f02d5532ffeabf3)) * **webapi:** unique username/email check on change user ([#1561](https://www.github.com/dasch-swiss/dsp-api/issues/1561)) ([4f26e22](https://www.github.com/dasch-swiss/dsp-api/commit/4f26e224fd062e1627f1e1350594e41764ff7614)) +* **rdf-api**: Use the Jena RDF API implementation by default (DSP-1153) ([1772](https://github.com/dasch-swiss/dsp-api/pull/1772)) ([389feb4](https://github.com/dasch-swiss/dsp-api/commit/389feb49b504f619b2164befd9c54e5595e06cb6)) ### Documentation @@ -64,7 +55,8 @@ * **rdf-api:** Use the Jena RDF API implementation by default (DSP-1153) ([#1772](https://www.github.com/dasch-swiss/dsp-api/issues/1772)) ([389feb4](https://www.github.com/dasch-swiss/dsp-api/commit/389feb49b504f619b2164befd9c54e5595e06cb6)) * Remove obsolete functions from StringFormatter. ([#1640](https://www.github.com/dasch-swiss/dsp-api/issues/1640)) ([5fa6de4](https://www.github.com/dasch-swiss/dsp-api/commit/5fa6de4e6c6b22842c771b8e5d4ffd49d29728f9)) * Update ci workflow release notes ([#1707](https://www.github.com/dasch-swiss/dsp-api/issues/1707)) ([d8e0b39](https://www.github.com/dasch-swiss/dsp-api/commit/d8e0b39a7da5d4c1e78212fb193097bfe96712f7)) - +* **gh-ci** CI is failing to test upgrade correctly (DSP-667) ([#1073](https://github.com/dasch-swiss/dsp-api/pull/1773)) ([13cbdab](https://github.com/dasch-swiss/dsp-api/commit/13cbdab92c87d1d5cb50c9f8a85dad246db3b1bd)) +* **bazel** Update Bazel maven rules to see if it fixes problems with macOS Big Sur (DSP-1099) ([#1761](https://github.com/dasch-swiss/dsp-api/pull/1761)) ([a2c9941](https://github.com/dasch-swiss/dsp-api/commit/a2c994107508f86692e19fcd86d272cd3cc88db7)) ### Enhancements