diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e9e7c7b27..5afd7c3d0 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,6 +3,7 @@ updates: - package-ecosystem: "docker" directory: "/" + target-branch: dev schedule: interval: "weekly" open-pull-requests-limit: 99 @@ -11,6 +12,7 @@ updates: - package-ecosystem: "github-actions" directory: "/" + target-branch: dev schedule: interval: "weekly" open-pull-requests-limit: 99 @@ -19,6 +21,7 @@ updates: - package-ecosystem: "pip" directory: "/" + target-branch: dev schedule: interval: "daily" open-pull-requests-limit: 99 diff --git a/.github/workflows/build_and_publish_docs.yml b/.github/workflows/build_and_publish_docs.yml index c7929357c..6d43756d2 100644 --- a/.github/workflows/build_and_publish_docs.yml +++ b/.github/workflows/build_and_publish_docs.yml @@ -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: @@ -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: | @@ -60,7 +62,7 @@ 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) }} @@ -68,7 +70,7 @@ jobs: 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 diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml index 92082de0c..a5592dd88 100644 --- a/.github/workflows/codestyle.yml +++ b/.github/workflows/codestyle.yml @@ -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: diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml index 860c9e99c..fae5d408a 100644 --- a/.github/workflows/test_coverage.yml +++ b/.github/workflows/test_coverage.yml @@ -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: diff --git a/.github/workflows/test_full.yml b/.github/workflows/test_full.yml index 289e39823..381c223b0 100644 --- a/.github/workflows/test_full.yml +++ b/.github/workflows/test_full.yml @@ -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: diff --git a/.github/workflows/update_dashboard.yml b/.github/workflows/update_dashboard.yml index 3cea8c9ec..c06e145aa 100644 --- a/.github/workflows/update_dashboard.yml +++ b/.github/workflows/update_dashboard.yml @@ -3,7 +3,7 @@ name: update_dashboard on: push: branches: - - 'dev' + - 'master' paths: - 'dff/utils/docker/dockerfile_stats' - 'dff/utils/docker/entrypoint_stats.sh' diff --git a/README.md b/README.md index 7414ddf02..ebab43d72 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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). diff --git a/docs/source/_templates/example-links.html b/docs/source/_templates/example-links.html index d3001f4c5..6e03f6b22 100644 --- a/docs/source/_templates/example-links.html +++ b/docs/source/_templates/example-links.html @@ -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' %} diff --git a/docs/source/_templates/source-links.html b/docs/source/_templates/source-links.html index 29773355a..6a08276d0 100644 --- a/docs/source/_templates/source-links.html +++ b/docs/source/_templates/source-links.html @@ -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' %}