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

Ts/38561 read teamscale.timestamp from git.properties #462

Merged
merged 19 commits into from
May 24, 2024

Conversation

AnonymFx
Copy link
Contributor

@AnonymFx AnonymFx commented May 16, 2024

Addresses issue TS-38561

  • Changes are tested adequately
  • Agent's README.md updated in case of user-visible changes
  • CHANGELOG.md updated
  • Present new features in N&N
  • TGA Tutorial updated
  • TIA Tutorial updated

Please respect the vote of the Teamscale bot or flag irrelevant findings as tolerated or false positives. If you feel that the Teamscale config needs adjustment, please state so in a comment and discuss this with your reviewer.

…t properties. Not used fully yet. Some tests added already.
…mp_from_git.properties

# Conflicts:
#	agent/src/test/java/com/teamscale/jacoco/agent/commit_resolution/git_properties/GitPropertiesLocatorTest.java
agent/README.md Outdated Show resolved Hide resolved
agent/README.md Outdated Show resolved Hide resolved
agent/README.md Outdated Show resolved Hide resolved
@AnonymFx AnonymFx marked this pull request as ready for review May 23, 2024 14:45
@AnonymFx AnonymFx requested a review from DreierF May 23, 2024 16:00
agent/README.md Outdated Show resolved Hide resolved
agent/README.md Outdated Show resolved Hide resolved
agent/README.md Outdated Show resolved Hide resolved
agent/README.md Outdated Show resolved Hide resolved
agent/README.md Outdated Show resolved Hide resolved
@@ -72,7 +72,7 @@ void searchFile(File file, boolean isJarFile) {
logger.debug(
"Found inconsistent git.properties file: the git.properties file in {} either does not specify the" +
" Teamscale project (teamscale.project) property, or does not specify the commit " +
"(git.commit.id, git.commit.branch + git.commit.time, or teamscale.timestamp) or ." +
"(git.commit.id, git.commit.branch + git.commit.time, or teamscale.commit.branch + teamscale.commit.time) or ." +
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we use the constants from GitPropertiesLocatorUtils to have them defined in one place?

AnonymFx and others added 2 commits May 24, 2024 09:56
Co-authored-by: Florian Dreier <dreier@cqse.eu>
@DreierF DreierF enabled auto-merge May 24, 2024 09:14
@DreierF DreierF merged commit 1380a2f into master May 24, 2024
5 of 7 checks passed
@DreierF DreierF deleted the ts/38561_read_teamscale.timestamp_from_git.properties branch May 24, 2024 09:22
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