Skip to content

Programming exercises: Only replace existing files when populating build plan repositories #9968

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Dec 10, 2024
Merged

Programming exercises: Only replace existing files when populating build plan repositories #9968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95c15a7
replace rm and mv , with cp -r
SimonEntholzer Dec 8, 2024
8a864c0
adapt translation
SimonEntholzer Dec 8, 2024
f6806f0
Merge branch 'develop' into feature/programming-exercises/do-not-remo…
SimonEntholzer Dec 8, 2024
69efd85
Merge branch 'develop' into feature/programming-exercises/do-not-remo…
SimonEntholzer Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/main/java/de/tum/cit/aet/artemis/buildagent/service/BuildJobContainerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,16 +342,11 @@ private void createScriptFile(String buildJobContainerId) {
private void addAndPrepareDirectoryAndReplaceContent(String containerId, Path repositoryPath, String newDirectoryName) {
copyToContainer(repositoryPath.toString(), containerId);
addDirectory(containerId, newDirectoryName, true);
removeDirectoryAndFiles(containerId, newDirectoryName);
renameDirectoryOrFile(containerId, LOCALCI_WORKING_DIRECTORY + "/" + repositoryPath.getFileName().toString(), newDirectoryName);
insertRepositoryFiles(containerId, LOCALCI_WORKING_DIRECTORY + "/" + repositoryPath.getFileName().toString(), newDirectoryName);
}

private void removeDirectoryAndFiles(String containerId, String newName) {
executeDockerCommand(containerId, null, false, false, true, "rm", "-rf", newName);
}

private void renameDirectoryOrFile(String containerId, String oldName, String newName) {
executeDockerCommand(containerId, null, false, false, true, "mv", oldName, newName);
private void insertRepositoryFiles(String containerId, String oldName, String newName) {
executeDockerCommand(containerId, null, false, false, true, "cp", "-r", oldName + (oldName.endsWith("/") ? "." : "/."), newName);
}

private void addDirectory(String containerId, String directoryName, boolean createParentsIfNecessary) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/i18n/de/programmingExercise.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
"auxiliaryRepository": {
"error": "Es gibt ein Problem mit den Hilfs-Repositories!",
"addAuxiliaryRepository": "Hilfs-Repository anlegen",
"usageDescription": "Du kannst Hilfsrepositorien verwenden, um zusätzlichen Code bereitzustellen, den die Studierenden nicht sehen oder ändern können. Der zusätzliche Code wird im angegebenen Checkout-Verzeichnis eingefügt, bevor der Build erstellt wird. Der eingefügte Code überschreibt alles, was sich an der durch das Checkout-Verzeichnis angegebenen Stelle befindet. Wenn du die Dateien der Studierenden nur teilweise überschreiben willst, muss das Build-Skript angepasst werden.",
"usageDescription": "Du kannst Hilfsrepositorien verwenden, um zusätzlichen Code bereitzustellen, den die Studierenden nicht sehen oder ändern können. Der zusätzliche Code wird im angegebenen Checkout-Verzeichnis eingefügt, bevor der Build erstellt wird. Die eingefügten Dateien überschreiben alle Dateien im Checkout-Verzeichnis, die den gleichen Namen haben. Dateien, die nicht überschrieben werden, bleiben erhalten.",
"repositoryName": "Name des Repositorys",
"checkoutDirectory": "Checkout-Verzeichnis",
"description": "Beschreibung",
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/i18n/en/programmingExercise.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
"auxiliaryRepository": {
"error": "There is a problem with the auxiliary repository.",
"addAuxiliaryRepository": "Add Auxiliary Repository",
"usageDescription": "You can use auxiliary repositories to provide additional code that students cannot see or modify. The additional code is inserted into the specified checkout directory before the submission is built. The inserted code overwrites everything which lies at the location specified by the checkout directory. If you only need to overwrite student files partially, you need to adapt the build script.",
"usageDescription": "You can use auxiliary repositories to provide additional code that students cannot see or modify. The additional code is inserted into the specified checkout directory before the submission is built. The additional code is inserted in the specified checkout directory before the build is created. The inserted files overwrite all files in the checkout directory which have the same name. Files that are not overwritten are retained.",
"repositoryName": "Repository Name",
"checkoutDirectory": "Checkout Directory",
"description": "Description",
Expand Down
Loading