update workflow and tasks

Author: Licini

.bumpversion.cfg

@@ -3,6 +3,21 @@ current_version = 0.1.1
 message = Bump version to {new_version}
 commit = True
 tag = True
+parse = ^
+	(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
+	(?:
+	(?P<release>rc)
+	(?:(?P<rc>\d+(?:\.\d+)*))?
+	)?
+serialize = 
+	{major}.{minor}.{patch}{release}{rc}
+	{major}.{minor}.{patch}
+
+[bumpversion:part:release]
+optional_value = final
+values = 
+	rc
+	final
 
 [bumpversion:file:setup.py]
 search = version="{current_version}"

.github/workflows/build.yml

@@ -3,10 +3,10 @@ name: build
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
 defaults:
   run:

.github/workflows/docs.yml

@@ -3,95 +3,60 @@ name: docs
 on:
   push:
     branches:
-      - master
-  # pull_request:
-  #   branches:
-  #     - master
-
-defaults:
-  run:
-    shell: bash -l {0}
+      - main
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - main
 
 jobs:
   build:
     name: build and deploy docs
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
-
       - uses: actions/checkout@v2
 
-      - uses: conda-incubator/[email protected]
+      - uses: compas-dev/[email protected]
+        id: docs
         with:
-          miniconda-version: "latest"
-          activate-environment: cgal
-          channels: conda-forge
-          python-version: 3.7
-
-      - name: build (windows)
-        run: |
-          conda install eigen boost-cpp mpir mpfr cgal-cpp">=5.0" pybind11 COMPAS">=0.16.0" -y
-          pip install -r requirements-dev.txt
-
-      - name: Generate docs
-        if: ${{ success() }}
-        run: |
-          invoke docs
-          # Get branch/tag/latest name from git
-          GITHUB_REF_REGEX="tags/v[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}|(pull/[0-9]+)|heads/master"
-          if [[ $GITHUB_REF =~ $GITHUB_REF_REGEX ]]; then
-              if [[ $BASH_REMATCH = pull* ]]; then
-                  echo This is a pull request
-                  FOLDER_NAME=pull_${BASH_REMATCH##*/}
-              elif [[ $BASH_REMATCH = tags/* ]]; then
-                  echo This is a version tag
-                  FOLDER_NAME=${BASH_REMATCH##*/v}
-              else
-                  echo This is a commit to master branch
-                  FOLDER_NAME=latest
-              fi;
-          fi;
-          echo "Docs will be deployed to https://compas.dev/compas_cgal/$FOLDER_NAME"
-          mkdir -p deploy/$BRANCH_OR_TAG && mv -T dist/docs deploy/$FOLDER_NAME/
+          dest: deploy
+          build_to_subfolder: true
 
       - name: Deploy docs
-        if: success()
+        if: success() && steps.docs.outputs.commit_type != 'pull'
         uses: crazy-max/ghaction-github-pages@v2
         with:
           target_branch: gh-pages
           build_dir: deploy
           keep_history: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+    
+    outputs:
+      commit_type: ${{ steps.docs.outputs.commit_type }}
+      current_version: ${{ steps.docs.outputs.current_version }}
+  
   docVersions:
     needs: build
+    if: needs.build.outputs.commit_type == 'tag'
     name: update doc versions
     runs-on: ubuntu-latest
     steps:
-
       - uses: actions/checkout@v2
         with:
           ref: gh-pages
 
-      - name: update doc versions
-        run: |
-          >doc_versions.txt
-          for folder in $(ls -rd */ | tr -d '/')
-          do 
-              if [[ $folder =~ ^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}$|^latest$ ]]
-              then 
-                  echo ${folder}  >> doc_versions.txt
-              fi
-          done
-          echo found available doc versions:
-          cat doc_versions.txt
+      - uses: compas-dev/[email protected]
+        with:
+          current_version: ${{ needs.build.outputs.current_version }}
 
       - name: Deploy docs
         if: success()
         uses: crazy-max/ghaction-github-pages@v2
         with:
           target_branch: gh-pages
           build_dir: ./
-          keep_history: false  
+          keep_history: false
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -1,25 +1,35 @@
+name: Release
+
 on:
   push:
-    # Sequence of patterns matched against refs/tags
     tags:
-      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
-
-name: Create Release
+      - 'v*'
 
 jobs:
-  build:
-    name: Create Release
+  Release:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
           release_name: Release ${{ github.ref }}
           draft: false
-          prerelease: false
+          prerelease: false
+
+
+  Publish:
+    needs: Release
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    - uses: compas-dev/[email protected]
+      with:
+        token: ${{ secrets.PYPI }}