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

Development: Allow overriding any template resource file #8380

Merged
merged 1 commit into from
Apr 15, 2024

Conversation

b-fein
Copy link
Contributor

@b-fein b-fein commented Apr 11, 2024

@coderabbitai ignore

Checklist

General

Server

  • Important: I implemented the changes with a very good performance and prevented too many (unnecessary) database calls.
  • I strictly followed the server coding and design guidelines.
  • I added multiple integration tests (Spring) related to the features (with a high test coverage).

Motivation and Context

The resource loader contains a as far as I can tell fairly arbitrary restriction that only files in templates/jenkins/ can be overridden by placing a identically named file next to the Artemis executable.
(arbitrary in so far as it was only needed for configurable Jenkins pipelines back then in #2306, but quite a few other features where it makes sense have been added since)

I would however also like to override other templates, e.g. the code of conduct readme.md, the data export readme.

Description

This PR removes the restriction to allow only to override files in templates/jenkins/ but allows all files in templates/ instead.

Steps for Testing

Prerequisites:

  • 1 Instructor
  1. Create a new programming exercise and check that the repositories contain the same initial content as usual.

Testserver States

Note

These badges show the state of the test servers.
Green = Currently available, Red = Currently locked







Review Progress

Code Review

  • Code Review 1
  • Code Review 2

Manual Tests

  • Test 1
  • Test 2

Test Coverage

unchanged

@github-actions github-actions bot added tests server Pull requests that update Java code. (Added Automatically!) labels Apr 11, 2024
@b-fein b-fein force-pushed the enhancement/allow-overriding-template branch from 80dd5db to 05274b3 Compare April 11, 2024 17:17
@b-fein b-fein temporarily deployed to artemis-test4.artemis.cit.tum.de April 11, 2024 17:34 — with GitHub Actions Inactive
@b-fein b-fein temporarily deployed to artemis-test3.artemis.cit.tum.de April 11, 2024 17:43 — with GitHub Actions Inactive
@b-fein b-fein marked this pull request as ready for review April 11, 2024 17:49
@b-fein b-fein requested a review from a team as a code owner April 11, 2024 17:49
@ls1intum ls1intum deleted a comment from coderabbitai bot Apr 11, 2024
Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

@ls1intum ls1intum deleted a comment from coderabbitai bot Apr 11, 2024
@b-fein b-fein force-pushed the enhancement/allow-overriding-template branch from 05274b3 to 78bbcfa Compare April 11, 2024 17:58
@b-fein b-fein requested a review from BaumiCoder April 15, 2024 07:36
@b-fein b-fein force-pushed the enhancement/allow-overriding-template branch from 78bbcfa to d8101cd Compare April 15, 2024 07:37
@b-fein b-fein added this to the 7.0.1 milestone Apr 15, 2024
Copy link
Member

@julian-christl julian-christl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code lgtm

@krusche krusche merged commit c29d9d9 into develop Apr 15, 2024
34 of 38 checks passed
@krusche krusche deleted the enhancement/allow-overriding-template branch April 15, 2024 22:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement ready to merge server Pull requests that update Java code. (Added Automatically!) small tests
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

5 participants