fix: apply activation_key security patch only in release mode#1376
Merged
fix: apply activation_key security patch only in release mode#1376
Conversation
The security patch added in #1366 fails when building against main/master edx-platform because the upstream commit is already present in master, so git am fails with "patch already applied". Move the RUN command inside the non-Main (Release mode) branch of the existing TUTOR_BRANCH_IS_MAIN conditional so it only applies when building from a release branch of edx-platform. Follow-up to #1366. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
github-project-automation
Bot
moved this from Pending Triage
to Done
in Tutor project management
ahmed-arb
added a commit
that referenced
this pull request
Apr 30, 2026
The security patch added in #1366 fails when building against main/master edx-platform because the upstream commit is already present in master, so git am fails with "patch already applied". Move the RUN command inside the non-Main (Release mode) branch of the existing TUTOR_BRANCH_IS_MAIN conditional so it only applies when building from a release branch of edx-platform. Follow-up to #1366. Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
|
@ahmed-arb, could you please create a release that includes this change? I'd like to remove this patch locally via |
Collaborator
Author
@Agrendalath, I am making a new release to fix this: #1379 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Follow-up to #1366. The security patch added in that PR fails when building against
masteredx-platform because the upstream commit is already present there, sogit amfails with "patch already applied". This breaks builds on Tutor Main.This PR moves the RUN command inside the non-Main (Release mode) branch of the existing
TUTOR_BRANCH_IS_MAINconditional, matching the pattern that the template already establishes for git patches.Testing
EDX_PLATFORM_VERSIONpointing torelease/ulmo.x): patch applies as before.EDX_PLATFORM_VERSION=master): patch is skipped, build no longer fails.🤖 Generated with Claude Code