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

Update espresso-ci scripts #3613

Merged
merged 4 commits into from
Apr 1, 2020
Merged

Conversation

jngrad
Copy link
Member

@jngrad jngrad commented Mar 31, 2020

Description of changes:

@jngrad jngrad added the DevOps label Mar 31, 2020
@jngrad jngrad added this to the Espresso 4.1.3 milestone Mar 31, 2020
@jngrad jngrad requested a review from KaiSzuttor March 31, 2020 19:58
src/core/statistics.hpp Outdated Show resolved Hide resolved
Copy link
Member

@KaiSzuttor KaiSzuttor left a comment

Choose a reason for hiding this comment

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

LGTM modulo tmp changes

@jngrad
Copy link
Member Author

jngrad commented Mar 31, 2020

I should have seen that coming: we need a chained if-else to test all possible names for clang-format and we need to use clang-format-9 instead of 6. The difference is minimal (only 2 files) but it's a circular change with version 6, i.e. once formatted with version 9, formatting it with the version 6 installed at the ICP will revert the change... So we're stuck with the Ubuntu 16.04 image until the ICP migrates to Ubuntu 20.04, which might take us months.

Now that the secret GitHub token is no longer part of the URL, it's
safe to raise an exception that prints the URL with the error code.
@jngrad jngrad force-pushed the refactor-espresso-ci branch 2 times, most recently from 7a8bf0a to 5636ee0 Compare March 31, 2020 22:28
@jngrad jngrad marked this pull request as ready for review March 31, 2020 22:32
@codecov
Copy link

codecov bot commented Mar 31, 2020

Codecov Report

Merging #3613 into python will decrease coverage by <1%.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff           @@
##           python   #3613   +/-   ##
======================================
- Coverage      87%     87%   -1%     
======================================
  Files         525     525           
  Lines       23398   23398           
======================================
- Hits        20583   20582    -1     
- Misses       2815    2816    +1
Impacted Files Coverage Δ
src/core/particle_data.cpp 96% <0%> (-1%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9ca0196...0289d77. Read the comment docs.

@fweik fweik requested a review from KaiSzuttor April 1, 2020 09:51
@fweik fweik self-assigned this Apr 1, 2020
@KaiSzuttor
Copy link
Member

I already approved

@KaiSzuttor KaiSzuttor added the automerge Merge with kodiak label Apr 1, 2020
@fweik
Copy link
Contributor

fweik commented Apr 1, 2020

Yes, but there were new changes after, did you look at them?

@fweik
Copy link
Contributor

fweik commented Apr 1, 2020

Also, since when is the approval not removed if new changes are pushed?

@jngrad
Copy link
Member Author

jngrad commented Apr 1, 2020

Also, since when is the approval not removed if new changes are pushed?

I realized that behavior several weeks ago and found it strange too, but did not question it. The "marked this pull request as ready for review 11 hours ago" message it posted automatically when removing the draft status of a PR. I did not add the automerge label immediately because we had to wait for the PR to complete to make sure we could trigger the webhook for a successful CI pipeline.

@fweik
Copy link
Contributor

fweik commented Apr 1, 2020

It's a setting in the branch protection rules. Not sure if this conflicts with kodiak's merge request commits, if so it has to be deactivated again.

@kodiakhq kodiakhq bot merged commit ed84280 into espressomd:python Apr 1, 2020
@jngrad jngrad deleted the refactor-espresso-ci branch January 18, 2022 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge with kodiak DevOps
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update espresso-ci bot with new GET syntax
3 participants