Merge 8a50e74 into ff917c2

.github/workflows/assign-default-project.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   assign_default_project:
     name: Assign default project to issue
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Assign vulnerability scans or Sentry issues to Enable

.github/workflows/automatic-pr-update.yml

@@ -7,7 +7,7 @@ jobs:
   # thats's all. single step is needed - if PR is mergeable according to
   # branch protection rules it will be merged automatically
   mergepal:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - uses: rasahq/update-pr-branch@601ac3dadf708b14e7f0252d98230538235f99d9

.github/workflows/automatic-release-to-main-merger.yml

@@ -19,7 +19,7 @@ env:
 
 jobs:
   update_merge_pr:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     # only run this workflow if a pull request has been merged
     if: github.event.pull_request.merged == true

.github/workflows/cancel-stale-workflows.yml

@@ -8,7 +8,7 @@ jobs:
   cancel-runs:
     # Prevent forks from running this to be nice
     if: github.repository == 'RasaHQ/rasa'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: n1hility/cancel-previous-runs@v2
       with:

.github/workflows/ci-docs-tests.yml

@@ -14,7 +14,7 @@ env:
 jobs:
   changes:
     name: Check for file changes
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       docs: ${{ steps.filter.outputs.docs }}
     steps:
@@ -27,7 +27,7 @@ jobs:
 
   test_documentation:
     name: Test Documentation
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [ changes ]
     if: needs.changes.outputs.docs == 'true'
 

.github/workflows/ci-model-regression-on-schedule.yml

@@ -15,7 +15,7 @@ env:
 jobs:
   read_test_configuration:
     name: Reads tests configuration
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -46,7 +46,7 @@ jobs:
   deploy_runner_gpu:
     name: Deploy Github Runner - GPU
     needs: read_test_configuration
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout
@@ -414,7 +414,7 @@ jobs:
 
   analyse_performance:
     name: Analyse Performance
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: always()
     needs:
     - deploy_runner_gpu
@@ -559,7 +559,7 @@ jobs:
     needs:
     - deploy_runner_gpu
     - model_regression_test_gpu
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       # Setup gcloud CLI

.github/workflows/ci-model-regression.yml

@@ -17,7 +17,7 @@ env:
 jobs:
   cleanup_runs:
     name: Cancel old branch builds
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
 
     steps:
@@ -32,7 +32,7 @@ jobs:
     name: Reads tests configuration
     needs: cleanup_runs
     if: "github.repository == 'RasaHQ/rasa' && contains(github.event.pull_request.labels.*.name, 'status:model-regression-tests')"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
       configuration_id: ${{ steps.fc_config.outputs.comment-id }}
@@ -141,7 +141,7 @@ jobs:
   deploy_runner_gpu:
     name: Deploy Github Runner - GPU
     needs: read_test_configuration
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: "contains(github.event.pull_request.labels.*.name, 'runner:gpu') && github.repository == 'RasaHQ/rasa' && contains(github.event.pull_request.labels.*.name, 'status:model-regression-tests') && needs.read_test_configuration.outputs.configuration_id != ''"
 
     steps:
@@ -421,7 +421,7 @@ jobs:
     - read_test_configuration
     env:
       ACCELERATOR_TYPE: "CPU"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       max-parallel: 1
       matrix: ${{fromJson(needs.read_test_configuration.outputs.matrix)}}
@@ -630,7 +630,7 @@ jobs:
 
   add_comment_results_gpu:
     name: Add a comment with the results
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs:
       - model_regression_test_gpu
 
@@ -706,7 +706,7 @@ jobs:
 
   add_comment_results_cpu:
     name: Add a comment with the results
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs:
       - model_regression_test_cpu
 
@@ -785,7 +785,7 @@ jobs:
     needs:
     - deploy_runner_gpu
     - model_regression_test_gpu
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: "contains(github.event.pull_request.labels.*.name, 'runner:gpu') && always() && contains(github.event.pull_request.labels.*.name, 'status:model-regression-tests')"
 
     steps:

.github/workflows/continous-integration.yml

@@ -41,7 +41,7 @@ env:
 jobs:
   changes:
     name: Check for file changes
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       # Both of the outputs below are strings but only one exists at any given time
       backend: ${{ steps.changed-files.outputs.backend || steps.run-all.outputs.backend }}
@@ -71,7 +71,7 @@ jobs:
     # Looks for doc test workflows and waits for it to complete successfully
     # Runs on tag pushes and pushes to main exclusively, as it is a dependency of release jobs
     name: Wait for docs tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [ changes ]
 
     steps:
@@ -94,7 +94,7 @@ jobs:
 
   quality:
     name: Code Quality
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [changes]
 
     steps:
@@ -171,7 +171,7 @@ jobs:
 
   changelog:
     name: Check for changelog
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout git repository 🕝
@@ -208,7 +208,7 @@ jobs:
         - test-full-model-training
         - test-other-unit-tests
         - test-performance
-        os: [ ubuntu-latest, windows-latest ]
+        os: [ ubuntu-22.04, windows-2019 ]
         python-version: [ 3.7, 3.8 ]
 
     steps:
@@ -263,15 +263,14 @@ jobs:
       run: poetry config virtualenvs.in-project true
 
     - name: Install Dependencies (Linux) 📦
-      if: needs.changes.outputs.backend == 'true' && matrix.os == 'ubuntu-latest'
+      if: needs.changes.outputs.backend == 'true' && matrix.os == 'ubuntu-22.04'
       run: |
         sudo apt-get -y install libpq-dev
-        make install-full | tee .output
+        make prepare-tests-ubuntu | tee .output
         if grep 'The lock file is not up to date' .output; then exit 1; fi
-        make prepare-tests-ubuntu
 
     - name: Install Dependencies (Windows) 📦
-      if: needs.changes.outputs.backend == 'true' && matrix.os == 'windows-latest'
+      if: needs.changes.outputs.backend == 'true' && matrix.os == 'windows-2019'
       # Restoring cache doesn't work properly on Windows due to symlinks.
       # We create symlinks for spacy models, that's why we need to clean them up
       # before caching the dependencies directory.
@@ -283,11 +282,10 @@ jobs:
           Remove-Item -Force -Recurse $spacy_data_dir
           New-Item -Path $spacy_data_dir -Type Directory
         }
-        make install-full
         make prepare-tests-windows-gha
 
     - name: Add github workflow problem matchers
-      if: needs.changes.outputs.backend == 'true' && matrix.python-version == 3.7 && matrix.os == 'ubuntu-latest'
+      if: needs.changes.outputs.backend == 'true' && matrix.python-version == 3.7 && matrix.os == 'ubuntu-22.04'
       # only annotate based on test runs on ubuntu: otherwise
       # all errors will be duplicated for each python / os combination
       # therefore, we only enable for the one where most tests are run
@@ -300,23 +298,23 @@ jobs:
       # see https://github.com/RasaHQ/rasa/issues/9734 for more information.
       # Once the memory issues have been addressed, all configurations should be run on
       # multiple threads
-      if: needs.changes.outputs.backend == 'true' && !(matrix.python-version == 3.8 && matrix.os == 'windows-latest') && (matrix.os == 'windows-latest' && matrix.test == 'test-nlu-predictors')
+      if: needs.changes.outputs.backend == 'true' && !(matrix.python-version == 3.8 && matrix.os == 'windows-2019') && (matrix.os == 'windows-2019' && matrix.test == 'test-nlu-predictors')
       env:
         JOBS: 1
         PYTHONIOENCODING: "utf-8"
       run: |
         make ${{ matrix.test }}
 
     - name: Test Code 🔍 (multithread)
-      if: needs.changes.outputs.backend == 'true' && !(matrix.python-version == 3.8 && matrix.os == 'windows-latest') && !(matrix.os == 'windows-latest' && matrix.test == 'test-nlu-predictors')
+      if: needs.changes.outputs.backend == 'true' && !(matrix.python-version == 3.8 && matrix.os == 'windows-2019') && !(matrix.os == 'windows-2019' && matrix.test == 'test-nlu-predictors')
       env:
         JOBS: 2
         PYTHONIOENCODING: "utf-8"
       run: |
         make ${{ matrix.test }}
 
     - name: Send Coverage Report 📊
-      if: needs.changes.outputs.backend == 'true' && matrix.python-version == 3.7 && matrix.os != 'windows-latest'
+      if: needs.changes.outputs.backend == 'true' && matrix.python-version == 3.7 && matrix.os != 'windows-2019'
       continue-on-error: true
       env:
         COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -340,7 +338,7 @@ jobs:
 
   integration_test:
     name: Run Integration Tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [changes]
     env:
       REDIS_HOST: localhost
@@ -445,9 +443,8 @@ jobs:
       if: needs.changes.outputs.backend == 'true'
       run: |
         sudo apt-get -y install libpq-dev
-        make install-full | tee .output
+        make prepare-tests-ubuntu | tee .output
         if grep 'The lock file is not up to date' .output; then exit 1; fi
-        make prepare-tests-ubuntu
 
     - name: Test Code with Services 🩺
       if: needs.changes.outputs.backend == 'true'
@@ -471,7 +468,7 @@ jobs:
 
   build_docker_base_images_and_set_env:
     name: Build Docker base images and setup environment
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       base_image_hash: ${{ steps.check_image.outputs.base_image_hash }}
       base_mitie_image_hash: ${{ steps.check_image.outputs.base_mitie_image_hash }}
@@ -628,7 +625,7 @@ jobs:
 
   docker:
     name: Build Docker
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: [changes, build_docker_base_images_and_set_env]
     env:
       IMAGE_TAG: ${{ needs.build_docker_base_images_and_set_env.outputs.image_tag }}
@@ -721,7 +718,7 @@ jobs:
 
   deploy:
     name: Deploy to PyPI
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     # deploy will only be run when there is a tag available
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') && github.repository == 'RasaHQ/rasa'

.github/workflows/dependabot-batch-updater.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   update_dependencies:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Update dependencies
     steps:
       - uses: RasaHQ/dependabot-batch-updater@v1.0

.github/workflows/documentation.yml

@@ -22,7 +22,7 @@ env:
 jobs:
   evaluate_release_tag:
     name: Evaluate release tag
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: github.repository == 'RasaHQ/rasa'  # don't run this for main branches of forks, would fail anyways
     outputs:
       build_docs: ${{ steps.check_tag.outputs.build_docs }}
@@ -91,7 +91,7 @@ jobs:
 
   docs:
     name: Build Docs
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [ evaluate_release_tag ]
     if: github.repository == 'RasaHQ/rasa' && needs.evaluate_release_tag.outputs.build_docs == 'true'  # don't run this for main branches of forks, would fail anyways
 

.github/workflows/security-scans.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   changes:
     name: Check for file changes
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       backend: ${{ steps.filter.outputs.backend }}
       docker: ${{ steps.filter.outputs.docker }}
@@ -22,7 +22,7 @@ jobs:
 
   cleanup_runs:
     name: Cancel old branch builds
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
 
     steps:
@@ -33,7 +33,7 @@ jobs:
 
   gitleaks:
     name: Detecting hardcoded secrets
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
       with:
@@ -47,7 +47,7 @@ jobs:
 
   bandit:
     name: Detect python security issues
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [changes]
 
     steps:

.github/workflows/spellcheck.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   spellcheck:
     name: Typo CI (GitHub Action)
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 4
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:

.github/workflows/vulnerability-scan.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   scan:
     name: Vulnerability scan
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     env:
       DOCKERFILE: Dockerfile_with_poetry_lock