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

Add a notice to the release testing rotation file #11142

Merged
merged 2 commits into from
Oct 6, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ jobs:
msg=$(git log -n1 --format=%b HEAD | head -1)
# Keep this line in sync with RELEASE_PR_NOTIF in ci/cron/wednesday.yml
if [ "$msg" = "This PR has been created by a script, which is not very smart" ]; then
pr_handler="<@$(head -1 release/rotation | awk '{print $1}')>"
pr_handler="<@$(awk '/^[^#]/ {print $1}' release/rotation | head -n 1)>"
else
pr_handler=""
fi
Expand Down
2 changes: 1 addition & 1 deletion ci/cron/tuesday.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ jobs:

source "$(bash_lib)"

RELEASE_MANAGER=$(head -1 release/rotation | awk '{print $1}')
RELEASE_MANAGER=$(awk '/^[^#]/ {print $1}' release/rotation | head -n 1)
Copy link
Contributor

Choose a reason for hiding this comment

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

Seeing those two diffs side-by-side now, do you think it'd be worth to move that to a function in bash-lib?

Copy link
Contributor

Choose a reason for hiding this comment

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

Commented on the second one but there are actually 5 instances, so I think we're definitely past the threshold where a function makes sense. I can do it as a separate PR if you want, though. No need to block this one on that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, please. I'll merge this. 🙇🏻


tell_slack "$(echo -e "Hi <@$RELEASE_MANAGER>! According to the <https://github.com/digital-asset/daml/blob/main/release/rotation|rotation>, you are in charge of the release tomorrow. Please make sure you plan accordingly, or find a replacement.\n\nIf anyone knows of any reason to delay or block the release (e.g. a PR that needs to get merged first), please make it known in thread before EOD.")"
18 changes: 11 additions & 7 deletions ci/cron/wednesday.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
git branch -D $branch || true
git checkout -b $branch
git add .
git -c user.name="Azure Pipelines DAML Build" \
git -c user.name="Azure Pipelines Daml Build" \
-c user.email="[email protected]" \
commit \
-m "$(printf "$title\n\n$body\n\nCHANGELOG_BEGIN\nCHANGELOG_END\n")"
Expand Down Expand Up @@ -88,10 +88,14 @@ jobs:
# labels, PRs are issues as far as the GH API is concerned.
}
rotate() {
local tmp
tmp=$(mktemp)
cp release/rotation $tmp
(tail -n +2 $tmp; head -1 $tmp) > release/rotation
# limitation: comments in the middle of the rotation will be hoisted to the top
local comments rotation
comments=$(mktemp)
rotation=$(mktemp)
awk '/^#/' release/rotation > $comments
awk '/^[^#]/' release/rotation > $rotation
cp $comments release/rotation
(tail -n +2 $rotation; head -1 $rotation) >> release/rotation
}
release_message() {
local handler=$1
Expand Down Expand Up @@ -119,8 +123,8 @@ jobs:

reset

NEXT_SLACK=$(head -1 release/rotation | awk '{print $1}')
NEXT_GH=$(head -1 release/rotation | awk '{print $2}')
NEXT_SLACK=$(awk '/^[^#]/ {print $1}' release/rotation | head -n 1)
NEXT_GH=$(awk '/^[^#]/ {print $2}' release/rotation | head -n 1)

PREV="v$(head -1 LATEST | awk '{print $2}')"
./release.sh new snapshot
Expand Down
2 changes: 1 addition & 1 deletion ci/prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
# API, there is still value in getting the notification on Slack, as
# we do have the build number and from there we can click through to
# the PR. Hence the `|| echo ""`.
PR_HANDLER=$(head -1 release/rotation | awk '{print $1}')
PR_HANDLER=$(awk '/^[^#]/ {print $1}' release/rotation | head -n 1)

case "$(status)" in
Succeeded*)
Expand Down
3 changes: 3 additions & 0 deletions release/rotation
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# If you are adding someone to the rotation, remember to also give them permission
# to access an ad-hoc machine for Windows testing. This can be done by opening a PR
# like the following: https://github.com/DACH-NY/daml-language-ad-hoc/pull/37
U02DCD54R28 adriaanm-da
U7BSDJUJX S11001001
U011H6KFYPN sofiafaro-da
Expand Down