Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix workflow issues #1404

Closed
wants to merge 2 commits into from
Closed

Conversation

VladyslavTy
Copy link

@VladyslavTy VladyslavTy commented Jul 16, 2024

Change description

Fix workflow errors for merge conflicts and tests workflow.

Type of change

  • Bug fix (fixes an issue)
  • New feature (adds functionality)

Related issues

Fix ENG-629

Checklists

Development

  • Lint rules pass locally
  • Application changes have been tested thoroughly
  • Automated tests covering modified code pass

Security

  • Security impact of change has been considered
  • Code follows company security practices and guidelines

Code review

  • Pull request has a descriptive title and context useful to a reviewer. Screenshots or screencasts are attached as necessary
  • "Ready for review" label attached and reviewers assigned
  • Changes have been reviewed by at least one other contributor
  • Pull request linked to task tracker where applicable

@VladyslavTy VladyslavTy changed the base branch from master to main July 16, 2024 09:27

This comment has been minimized.

Copy link

Checking git merge conflicts against https://github.com/openedx/edx-platform.git

Comparing with open-release/nutmeg.master
Benchmark conflicts with master 0
Current conflicts 299
Summary Adds 299 new conflicts. How can we do better?
New conflicting files with 'open-release/nutmeg.master'
.dockerignore
Dockerfile
Makefile
cms/celery.py
cms/djangoapps/contentstore/api/tests/test_validation.py
cms/djangoapps/contentstore/courseware_index.py
cms/djangoapps/contentstore/tasks.py
cms/djangoapps/contentstore/tests/test_course_create_rerun.py
cms/djangoapps/contentstore/tests/test_course_settings.py
cms/djangoapps/contentstore/tests/test_courseware_index.py
cms/djangoapps/contentstore/tests/test_proctoring.py
cms/djangoapps/contentstore/tests/test_tasks.py
cms/djangoapps/contentstore/tests/test_utils.py
cms/djangoapps/contentstore/utils.py
cms/djangoapps/contentstore/views/assets.py
cms/djangoapps/contentstore/views/course.py
cms/djangoapps/contentstore/views/tests/test_assets.py
cms/djangoapps/contentstore/views/tests/test_certificates.py
cms/djangoapps/contentstore/views/tests/test_item.py
cms/djangoapps/contentstore/views/transcript_settings.py
cms/djangoapps/contentstore/views/user.py
cms/djangoapps/course_creators/tests/test_admin.py
cms/envs/common.py
cms/envs/devstack.py
cms/envs/production.py
cms/templates/admin/base_site.html
cms/templates/widgets/deprecated-course-key-warning.html
cms/urls.py
common/djangoapps/student/admin.py
common/djangoapps/student/helpers.py
common/djangoapps/student/models.py
common/djangoapps/student/signals/receivers.py
common/djangoapps/student/tests/test_certificates.py
common/djangoapps/student/tests/test_email.py
common/djangoapps/student/tests/test_events.py
common/djangoapps/student/tests/test_helpers.py
common/djangoapps/student/tests/test_linkedin.py
common/djangoapps/student/tests/test_recent_enrollments.py
common/djangoapps/student/tests/test_tasks.py
common/djangoapps/student/views/management.py
common/djangoapps/third_party_auth/pipeline.py
common/djangoapps/third_party_auth/settings.py
common/djangoapps/third_party_auth/tests/test_pipeline.py
common/djangoapps/third_party_auth/utils.py
common/djangoapps/track/tests/test_shim.py
common/djangoapps/track/urls.py
common/djangoapps/track/views/__init__.py
common/djangoapps/track/views/segmentio.py
common/djangoapps/track/views/tests/test_views.py
common/djangoapps/util/course.py
common/djangoapps/util/tests/test_course.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/modulestore/mongo/base.py
common/lib/xmodule/xmodule/tests/test_course_module.py
common/lib/xmodule/xmodule/video_module/video_handlers.py
common/lib/xmodule/xmodule/video_module/video_module.py
lms/celery.py
lms/djangoapps/badges/events/course_complete.py
lms/djangoapps/badges/events/tests/test_course_complete.py
lms/djangoapps/certificates/api.py
lms/djangoapps/certificates/signals.py
lms/djangoapps/certificates/tests/test_api.py
lms/djangoapps/certificates/tests/test_signals.py
lms/djangoapps/certificates/tests/test_support_views.py
lms/djangoapps/certificates/tests/test_views.py
lms/djangoapps/certificates/tests/test_webview_views.py
lms/djangoapps/certificates/urls.py
lms/djangoapps/certificates/views/webview.py
lms/djangoapps/course_api/tests/test_serializers.py
lms/djangoapps/course_api/tests/test_views.py
lms/djangoapps/course_blocks/transformers/tests/test_load_override_data.py
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/courses.py
lms/djangoapps/courseware/tests/test_navigation.py
lms/djangoapps/courseware/views/views.py
lms/djangoapps/discussion/django_comment_client/base/tests.py
lms/djangoapps/discussion/django_comment_client/tests/test_utils.py
lms/djangoapps/grades/models.py
lms/djangoapps/grades/tests/test_tasks.py
lms/djangoapps/instructor/enrollment.py
lms/djangoapps/instructor/tests/test_api.py
lms/djangoapps/instructor/tests/test_api_email_localization.py
lms/djangoapps/instructor/tests/test_certificates.py
lms/djangoapps/instructor/tests/test_ecommerce.py
lms/djangoapps/instructor/tests/test_enrollment.py
lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py
lms/djangoapps/instructor/views/api.py
lms/djangoapps/instructor/views/instructor_dashboard.py
lms/djangoapps/static_template_view/urls.py
lms/envs/common.py
lms/envs/devstack.py
lms/envs/test.py
lms/lib/courseware_search/lms_filter_generator.py
lms/lib/tests/test_utils.py
lms/templates/dashboard/_dashboard_certificate_information.html
lms/templates/split_test_author_view.html
lms/templates/student_account/register.underscore
lms/templates/video.html
lms/tests.py
lms/urls.py
openedx/core/djangoapps/credentials/models.py
openedx/core/djangoapps/signals/signals.py
openedx/core/djangoapps/site_configuration/models.py
openedx/core/djangoapps/site_configuration/tests/test_models.py
openedx/core/djangoapps/theming/finders.py
openedx/core/djangoapps/user_api/accounts/api.py
openedx/core/djangoapps/user_api/accounts/image_helpers.py
openedx/core/djangoapps/user_api/accounts/tests/test_settings_views.py
openedx/core/djangoapps/user_api/accounts/tests/test_utils.py
openedx/core/djangoapps/user_api/accounts/tests/test_views.py
openedx/core/djangoapps/user_api/accounts/utils.py
openedx/core/djangoapps/user_api/accounts/views.py
openedx/core/djangoapps/user_api/management/tests/test_sync_hubspot_contacts.py
openedx/core/djangoapps/user_api/tests/test_views.py
openedx/core/djangoapps/user_api/views.py
openedx/core/djangoapps/user_authn/cookies.py
openedx/core/djangoapps/user_authn/tasks.py
openedx/core/djangoapps/user_authn/views/login.py
openedx/core/djangoapps/user_authn/views/logout.py
openedx/core/djangoapps/user_authn/views/password_reset.py
openedx/core/djangoapps/user_authn/views/register.py
openedx/core/djangoapps/user_authn/views/registration_form.py
openedx/core/djangoapps/user_authn/views/tests/test_logout.py
openedx/core/djangoapps/user_authn/views/tests/test_register.py
openedx/core/lib/api/permissions.py
openedx/core/lib/cache_utils.py
openedx/core/release.py
openedx/features/course_experience/utils.py
openedx/features/course_experience/views/course_home.py
pavelib/assets.py
pavelib/prereqs.py
requirements/constraints.txt
requirements/edx-sandbox/base.in
requirements/edx/base.in
requirements/edx/base.txt
requirements/edx/development.txt
requirements/edx/django.txt
requirements/edx/github.in
requirements/edx/testing.txt
tox.ini
Comparing with master
Benchmark conflicts with master 0
Current conflicts 329
Summary Adds 329 new conflicts. How can we do better?
New conflicting files with 'master'
.dockerignore
.tx/config
Dockerfile
Makefile
circle.yml
cms/celery.py
cms/djangoapps/contentstore/api/tests/test_validation.py
cms/djangoapps/contentstore/courseware_index.py
cms/djangoapps/contentstore/tasks.py
cms/djangoapps/contentstore/tests/test_course_create_rerun.py
cms/djangoapps/contentstore/tests/test_course_settings.py
cms/djangoapps/contentstore/tests/test_courseware_index.py
cms/djangoapps/contentstore/tests/test_proctoring.py
cms/djangoapps/contentstore/tests/test_tasks.py
cms/djangoapps/contentstore/tests/test_utils.py
cms/djangoapps/contentstore/utils.py
cms/djangoapps/contentstore/views/assets.py
cms/djangoapps/contentstore/views/certificates.py
cms/djangoapps/contentstore/views/course.py
cms/djangoapps/contentstore/views/tests/test_assets.py
cms/djangoapps/contentstore/views/tests/test_certificates.py
cms/djangoapps/contentstore/views/tests/test_header_menu.py
cms/djangoapps/contentstore/views/tests/test_item.py
cms/djangoapps/contentstore/views/transcript_settings.py
cms/djangoapps/contentstore/views/user.py
cms/djangoapps/course_creators/tests/test_admin.py
cms/envs/common.py
cms/envs/devstack.py
cms/envs/production.py
cms/templates/admin/base_site.html
cms/templates/widgets/deprecated-course-key-warning.html
cms/urls.py
common/djangoapps/student/admin.py
common/djangoapps/student/helpers.py
common/djangoapps/student/models.py
common/djangoapps/student/signals/receivers.py
common/djangoapps/student/tasks.py
common/djangoapps/student/tests/test_certificates.py
common/djangoapps/student/tests/test_email.py
common/djangoapps/student/tests/test_events.py
common/djangoapps/student/tests/test_helpers.py
common/djangoapps/student/tests/test_linkedin.py
common/djangoapps/student/tests/test_recent_enrollments.py
common/djangoapps/student/tests/test_tasks.py
common/djangoapps/student/views/management.py
common/djangoapps/third_party_auth/pipeline.py
common/djangoapps/third_party_auth/settings.py
common/djangoapps/third_party_auth/tests/test_pipeline.py
common/djangoapps/third_party_auth/utils.py
common/djangoapps/third_party_auth/views.py
common/djangoapps/track/tests/test_shim.py
common/djangoapps/track/urls.py
common/djangoapps/track/views/__init__.py
common/djangoapps/track/views/segmentio.py
common/djangoapps/track/views/tests/test_views.py
common/djangoapps/util/course.py
common/djangoapps/util/tests/test_course.py
common/lib/xmodule/xmodule/js/src/video/01_initialize.js
common/lib/xmodule/xmodule/tests/test_course_module.py
common/lib/xmodule/xmodule/x_module.py
lms/celery.py
lms/djangoapps/badges/events/course_complete.py
lms/djangoapps/badges/events/tests/test_course_complete.py
lms/djangoapps/certificates/api.py
lms/djangoapps/certificates/signals.py
lms/djangoapps/certificates/tests/test_api.py
lms/djangoapps/certificates/tests/test_signals.py
lms/djangoapps/certificates/tests/test_support_views.py
lms/djangoapps/certificates/tests/test_views.py
lms/djangoapps/certificates/tests/test_webview_views.py
lms/djangoapps/certificates/urls.py
lms/djangoapps/certificates/views/webview.py
lms/djangoapps/course_api/tests/test_serializers.py
lms/djangoapps/course_api/tests/test_views.py
lms/djangoapps/course_blocks/transformers/tests/test_load_override_data.py
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/courses.py
lms/djangoapps/courseware/tests/test_navigation.py
lms/djangoapps/courseware/views/index.py
lms/djangoapps/courseware/views/views.py
lms/djangoapps/discussion/django_comment_client/base/tests.py
lms/djangoapps/discussion/django_comment_client/tests/test_utils.py
lms/djangoapps/grades/models.py
lms/djangoapps/grades/tests/test_tasks.py
lms/djangoapps/instructor/enrollment.py
lms/djangoapps/instructor/tests/test_api.py
lms/djangoapps/instructor/tests/test_api_email_localization.py
lms/djangoapps/instructor/tests/test_certificates.py
lms/djangoapps/instructor/tests/test_ecommerce.py
lms/djangoapps/instructor/tests/test_enrollment.py
lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py
lms/djangoapps/instructor/views/api.py
lms/djangoapps/instructor/views/instructor_dashboard.py
lms/djangoapps/static_template_view/urls.py
lms/envs/common.py
lms/envs/devstack.py
lms/envs/test.py
lms/lib/courseware_search/lms_filter_generator.py
lms/lib/tests/test_utils.py
lms/templates/certificates/url_unsupported.html
lms/templates/dashboard/_dashboard_certificate_information.html
lms/templates/split_test_author_view.html
lms/templates/student_account/register.underscore
lms/templates/video.html
lms/tests.py
lms/urls.py
openedx/core/djangoapps/content/course_overviews/models.py
openedx/core/djangoapps/credentials/models.py
openedx/core/djangoapps/signals/signals.py
openedx/core/djangoapps/site_configuration/models.py
openedx/core/djangoapps/site_configuration/tests/test_models.py
openedx/core/djangoapps/theming/finders.py
openedx/core/djangoapps/user_api/accounts/api.py
openedx/core/djangoapps/user_api/accounts/image_helpers.py
openedx/core/djangoapps/user_api/accounts/tests/test_settings_views.py
openedx/core/djangoapps/user_api/accounts/tests/test_utils.py
openedx/core/djangoapps/user_api/accounts/tests/test_views.py
openedx/core/djangoapps/user_api/accounts/utils.py
openedx/core/djangoapps/user_api/accounts/views.py
openedx/core/djangoapps/user_api/management/tests/test_sync_hubspot_contacts.py
openedx/core/djangoapps/user_api/tests/test_views.py
openedx/core/djangoapps/user_api/views.py
openedx/core/djangoapps/user_authn/cookies.py
openedx/core/djangoapps/user_authn/views/login.py
openedx/core/djangoapps/user_authn/views/logout.py
openedx/core/djangoapps/user_authn/views/password_reset.py
openedx/core/djangoapps/user_authn/views/register.py
openedx/core/djangoapps/user_authn/views/registration_form.py
openedx/core/djangoapps/user_authn/views/tests/test_logout.py
openedx/core/djangoapps/user_authn/views/tests/test_register.py
openedx/core/lib/api/permissions.py
openedx/core/lib/cache_utils.py
openedx/features/course_experience/utils.py
openedx/features/course_experience/views/course_home.py
openedx/features/learner_profile/static/learner_profile/js/views/badge_view.js
openedx/features/learner_profile/static/learner_profile/js/views/share_modal_view.js
openedx/features/learner_profile/static/learner_profile/templates/badge_list.underscore
openedx/features/learner_profile/static/learner_profile/templates/badge_placeholder.underscore
pavelib/assets.py
pavelib/i18n.py
pavelib/prereqs.py
pavelib/servers.py
pavelib/utils/envs.py
requirements/constraints.txt
requirements/edx-sandbox/base.in
requirements/edx/base.in
requirements/edx/base.txt
requirements/edx/development.txt
requirements/edx/django.txt
requirements/edx/github.in
requirements/edx/testing.txt
scripts/Jenkinsfiles/python
scripts/Jenkinsfiles/quality
scripts/circle-ci-tests.sh
setup.py
tox.ini
xmodule/course_block.py
xmodule/modulestore/mongo/base.py
xmodule/modulestore/tests/test_tahoe_changes_for_django_modulestore.py
xmodule/video_block/video_block.py
xmodule/video_block/video_handlers.py

@VladyslavTy VladyslavTy deleted the fix/fix-workflow-configurations branch July 16, 2024 11:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants