Skip to content

Commit

Permalink
update workflows and docs to use master branch
Browse files Browse the repository at this point in the history
  • Loading branch information
RLKRo committed Oct 3, 2023
1 parent 61de676 commit d97a569
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 15 deletions.
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ updates:

- package-ecosystem: "docker"
directory: "/"
target-branch: dev
schedule:
interval: "weekly"
open-pull-requests-limit: 99
Expand All @@ -11,6 +12,7 @@ updates:

- package-ecosystem: "github-actions"
directory: "/"
target-branch: dev
schedule:
interval: "weekly"
open-pull-requests-limit: 99
Expand All @@ -19,6 +21,7 @@ updates:

- package-ecosystem: "pip"
directory: "/"
target-branch: dev
schedule:
interval: "daily"
open-pull-requests-limit: 99
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/build_and_publish_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@ on:
push:
branches:
- dev
- master
- test/**
pull_request:
branches:
- dev
- master
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/dev' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/dev' && github.ref != 'refs/heads/master' }}

jobs:
publish:
Expand Down Expand Up @@ -51,7 +53,7 @@ jobs:
run: touch docs/build/.nojekyll

- name: save branch name without slashes
if: ${{ github.ref != 'refs/heads/dev' }}
if: ${{ github.ref != 'refs/heads/master' }}
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
run: |
Expand All @@ -60,15 +62,15 @@ jobs:
echo BRANCH_NAME=${BRANCH_NAME} >> $GITHUB_ENV
- name: save artifact
if: ${{ github.ref != 'refs/heads/dev' }}
if: ${{ github.ref != 'refs/heads/master' }}
uses: actions/upload-artifact@v3
with:
name: ${{ format('github-pages-for-branch-{0}', env.BRANCH_NAME) }}
path: docs/build/
retention-days: 3

- name: deploy website
if: ${{ github.ref == 'refs/heads/dev' }}
if: ${{ github.ref == 'refs/heads/master' }}
uses: JamesIves/github-pages-deploy-action@v4
with:
branch: gh-pages
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/codestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@ on:
push:
branches:
- dev
- master
- test/**
pull_request:
branches:
- dev
- master
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/dev' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/dev' && github.ref != 'refs/heads/master' }}

jobs:
lint:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@ on:
push:
branches:
- dev
- master
- test/**
pull_request:
branches:
- dev
- master
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/dev' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/dev' && github.ref != 'refs/heads/master' }}

jobs:
test_coverage:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test_full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@ on:
push:
branches:
- dev
- master
- test/**
pull_request:
branches:
- dev
- master
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/dev' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/dev' && github.ref != 'refs/heads/master' }}

jobs:
test_full:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_dashboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: update_dashboard
on:
push:
branches:
- 'dev'
- 'master'
paths:
- 'dff/utils/docker/dockerfile_stats'
- 'dff/utils/docker/entrypoint_stats.sh'
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Okey
```

To get more advanced examples, take a look at
[tutorials](https://github.com/deeppavlov/dialog_flow_framework/tree/dev/tutorials) on GitHub.
[tutorials](https://github.com/deeppavlov/dialog_flow_framework/tree/master/tutorials) on GitHub.

# Context Storages
## Description
Expand Down Expand Up @@ -150,8 +150,8 @@ def handle_request(request):
```

To get more advanced examples, take a look at
[tutorials](https://github.com/deeppavlov/dialog_flow_framework/tree/dev/tutorials/context_storages) on GitHub.
[tutorials](https://github.com/deeppavlov/dialog_flow_framework/tree/master/tutorials/context_storages) on GitHub.

# Contributing to the Dialog Flow Framework

Please refer to [CONTRIBUTING.md](https://github.com/deeppavlov/dialog_flow_framework/blob/dev/CONTRIBUTING.md).
Please refer to [CONTRIBUTING.md](https://github.com/deeppavlov/dialog_flow_framework/blob/master/CONTRIBUTING.md).
2 changes: 1 addition & 1 deletion docs/source/_templates/example-links.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% if meta is defined and meta is not none and 'tutorial_name' in meta %}
{% set repo_path = "/".join(meta['tutorial_name'].split("/")[-1].split(".")) %}
{% set github_link = 'https://github.com/deeppavlov/dialog_flow_framework/blob/dev/' ~ repo_path ~ '.py' %}
{% set github_link = 'https://github.com/deeppavlov/dialog_flow_framework/blob/master/' ~ repo_path ~ '.py' %}
{% set notebook_link = '../' ~ meta['tutorial_name'] ~ '.ipynb' %}
{% set colab_link = 'https://colab.research.google.com/github/deeppavlov/dialog_flow_framework/blob/gh-pages/' ~ meta['tutorial_name'] ~ '.ipynb' %}

Expand Down
2 changes: 1 addition & 1 deletion docs/source/_templates/source-links.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% if meta is defined and meta is not none and 'source_name' in meta %}
{% set github_link = 'https://github.com/deeppavlov/dialog_flow_framework/blob/dev/' ~ meta['source_name'] ~ '.py' %}
{% set github_link = 'https://github.com/deeppavlov/dialog_flow_framework/blob/master/' ~ meta['source_name'] ~ '.py' %}

<a href="{{ github_link }}" data-behavior="call-to-action-event" data-response="View on Github" target="_blank">
<div id="github-view-link">
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
html_context = {
"github_user": "deeppavlov",
"github_repo": "dialog_flow_framework",
"github_version": "dev",
"github_version": "master",
"doc_path": "docs/source",
}

Expand Down
2 changes: 1 addition & 1 deletion docs/source/development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Development
Contribution
~~~~~~~~~~~~~~~

`Contribution rules <https://github.com/deeppavlov/dialog_flow_framework/blob/dev/CONTRIBUTING.md>`_ provide
`Contribution rules <https://github.com/deeppavlov/dialog_flow_framework/blob/master/CONTRIBUTING.md>`_ provide
guidelines and rules for contributing to the Dialog Flow Framework project. It includes information on
how to contribute code to the project, manage your workflow, use tests, and so on.

Expand Down

0 comments on commit d97a569

Please sign in to comment.