From 96c39fa59869e426eb37ecf2a493d68bb24522aa Mon Sep 17 00:00:00 2001
From: Vladyslav Tymofeiev <“vladyslavty@softwareplanetgroup.com”>
Date: Mon, 15 Jul 2024 17:36:11 +0300
Subject: [PATCH 1/2] Change upstream_repo variable to actual value

---
 .github/workflows/report_conflicts.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/report_conflicts.yml b/.github/workflows/report_conflicts.yml
index 3c1b5e9e8ba..96ff1955f55 100644
--- a/.github/workflows/report_conflicts.yml
+++ b/.github/workflows/report_conflicts.yml
@@ -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:

From da69fb92c8aa09169bc48e2b0523fa8da432b561 Mon Sep 17 00:00:00 2001
From: Vladyslav Tymofeiev <“vladyslavty@softwareplanetgroup.com”>
Date: Tue, 16 Jul 2024 12:21:58 +0300
Subject: [PATCH 2/2] Add trusted host workaround for tests workflow

---
 .github/workflows/tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 989a259d4ec..b96fe22dde4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -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: |