Skip to content

Commit

Permalink
Merge pull request #1405 from appsembler/fix/fix-workflow-configurations
Browse files Browse the repository at this point in the history
Fix workflow configurations
  • Loading branch information
VladyslavTy authored Jul 16, 2024
2 parents 2de42bd + da69fb9 commit 0e8250f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/report_conflicts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
uses: appsembler/action-conflict-counter/.github/workflows/report-via-comment.yml@main
with:
local_base_branch: ${{ github.base_ref }}
upstream_repo: 'https://github.com/edx/edx-platform.git'
upstream_repo: 'https://github.com/openedx/edx-platform.git'
upstream_branches: 'open-release/nutmeg.master,master'
exclude_paths: 'cms/static/js/,conf/locale/,lms/static/js/,package.json,package-lock.json,.github/'
secrets:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
env:
PIP_TRUSTED_HOST: "pypi.python.org pypi.org files.pythonhosted.org"
- name: Install dependencies
# TODO: Remove tox-pip-version once we upgrade to Koa+, or whenever we have addressed pip 20.3 strict issues.
run: |
Expand Down

0 comments on commit 0e8250f

Please sign in to comment.