Skip to content

Commit

Permalink
Merge pull request #13013 from RasaHQ/ATO-2132
Browse files Browse the repository at this point in the history
Delete auto main to branch merge workflow
  • Loading branch information
m-vdb authored Feb 20, 2024
2 parents 914bb98 + dd295b3 commit 68ce281
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 128 deletions.
113 changes: 0 additions & 113 deletions .github/workflows/automatic-release-to-main-merger.yml

This file was deleted.

14 changes: 0 additions & 14 deletions .github/workflows/continous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -588,20 +588,6 @@ jobs:
coverage combine "${final_dir}/"*
coverage xml
- name: Analyse code with SonarCloud
uses: sonarsource/sonarcloud-github-action@5875562561d22a34be0c657405578705a169af6c
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
with:
args: >
-Dsonar.organization=rasahq
-Dsonar.projectKey=RasaHQ_rasa
-Dsonar.sources=.
-Dsonar.python.coverage.reportPaths=${{ github.workspace }}/tests_coverage
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.verbose=true
integration_test:
name: Run Non-Sequential Integration Tests
if: github.ref_type != 'tag'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ prepare-tests-windows:
# It will retry the installation 5 times if it fails
# See: https://github.com/actions/virtual-environments/blob/main/images/win/scripts/ImageHelpers/ChocoHelpers.ps1
prepare-tests-windows-gha:
powershell -command "Choco-Install wget graphviz"
powershell -command "Install-ChocoPackage wget graphviz"

test: clean
# OMP_NUM_THREADS can improve overall performance using one thread by process (on tensorflow), avoiding overload
Expand Down

0 comments on commit 68ce281

Please sign in to comment.