Skip to content

Commit

Permalink
Merge branch 'main' into doc/adding-line-lenght-option
Browse files Browse the repository at this point in the history
  • Loading branch information
germa89 authored Dec 15, 2022
2 parents a3ab8e8 + 1e28b80 commit db63bf8
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 25 deletions.
34 changes: 9 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ on:
push:
tags:
- "*"
branches:
- main

env:
PROJECT_NAME: 'PyMAPDL'
Expand All @@ -31,10 +29,10 @@ env:
# You should go up in number, if you go down (or repeat a previous value)
# you might end up reusing a previous cache if it haven't been deleted already.
# It applies 7 days retention policy by default.
RESET_PIP_CACHE: 3
RESET_EXAMPLES_CACHE: 3
RESET_DOC_BUILD_CACHE: 3
RESET_AUTOSUMMARY_CACHE: 3
RESET_PIP_CACHE: 4
RESET_EXAMPLES_CACHE: 4
RESET_DOC_BUILD_CACHE: 4
RESET_AUTOSUMMARY_CACHE: 4

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -109,9 +107,9 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: Python-v${{ env.RESET_PIP_CACHE }}-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml') }}
key: Python-v${{ env.RESET_PIP_CACHE }}-Linux-${{ env.MAIN_PYTHON_VERSION }}-${{ hashFiles('pyproject.toml') }}
restore-keys: |
Python-v${{ env.RESET_PIP_CACHE }}-${{ runner.os }}-${{ matrix.python-version }}
Python-v${{ env.RESET_PIP_CACHE }}-Linux-${{ env.MAIN_PYTHON_VERSION }}
- name: "Test virtual framebuffer"
run: |
Expand Down Expand Up @@ -253,7 +251,6 @@ jobs:
build_test:
name: "Remote: Build and unit testing"
runs-on: ubuntu-latest
needs: [smoke-tests]
strategy:
matrix:
mapdl-version: ['v21.1.1', 'v21.2.1', 'v22.1.0', 'v22.2.0', 'v22.2-ubuntu']
Expand All @@ -280,9 +277,9 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: Python-v${{ env.RESET_PIP_CACHE }}-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml') }}
key: Python-v${{ env.RESET_PIP_CACHE }}-Linux-${{ env.MAIN_PYTHON_VERSION }}-${{ hashFiles('pyproject.toml') }}
restore-keys: |
Python-v${{ env.RESET_PIP_CACHE }}-${{ runner.os }}-${{ matrix.python-version }}
Python-v${{ env.RESET_PIP_CACHE }}-Linux-${{ env.MAIN_PYTHON_VERSION }}
- name: "Test virtual framebuffer"
run: |
Expand Down Expand Up @@ -406,7 +403,6 @@ jobs:
build_test_ubuntu:
name: "Local: Build and unit testing on Ubuntu"
runs-on: ubuntu-latest
needs: [smoke-tests]
timeout-minutes: 35
container:
image: ghcr.io/pyansys/mapdl:v22.2-ubuntu
Expand Down Expand Up @@ -527,7 +523,7 @@ jobs:

release:
if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
needs: [docs_build, build_test, build_test_ubuntu]
needs: [docs_build, build_test, build_test_ubuntu, smoke-tests]
runs-on: ubuntu-latest
steps:

Expand Down Expand Up @@ -555,18 +551,6 @@ jobs:
title: `Release FAILED!`,
}"

upload_dev_docs:
name: "Upload dev documentation"
if: ${{ github.ref == 'refs/heads/main' || github.event.inputs.publish == 'true' }}
runs-on: ubuntu-latest
needs: [docs_build]
steps:
- name: Deploy the latest documentation
uses: pyansys/actions/doc-deploy-dev@v2
with:
cname: ${{ env.DOCUMENTATION_CNAME }}
token: ${{ secrets.GITHUB_TOKEN }}

upload_docs_release:
name: "Upload release documentation"
if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/dev-docs-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Dev docs publisher

on:
workflow_dispatch:
push:
tags:
- "*"
branches:
- main

env:
DOCUMENTATION_CNAME: 'mapdl.docs.pyansys.com'

jobs:
upload_dev_docs:
name: "Upload dev documentation"
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
steps:
- name: Deploy the latest documentation
uses: pyansys/actions/doc-deploy-dev@v2
with:
cname: ${{ env.DOCUMENTATION_CNAME }}
token: ${{ secrets.GITHUB_TOKEN }}

0 comments on commit db63bf8

Please sign in to comment.