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

remove unneeded jobs for rel/auth-4.9.x branch #13839

Merged
merged 1 commit into from Mar 14, 2024

Conversation

Habbie
Copy link
Member

@Habbie Habbie commented Feb 29, 2024

Short description

Checklist

I have:

  • read the CONTRIBUTING.md document
  • compiled this code
  • tested this code
  • included documentation (including possible behaviour changes)
  • documented the code
  • added or modified regression test(s)
  • added or modified unit test(s)
  • checked that this code was merged to master

@omoerbeek
Copy link
Member

omoerbeek commented Feb 29, 2024

Shouldn't this into the rel/auth-4.9.x branch and not into master?

@Habbie Habbie changed the base branch from master to rel/auth-4.9.x February 29, 2024 12:24
@Habbie
Copy link
Member Author

Habbie commented Feb 29, 2024

Shouldn't this into the rel/auth-4.9.x branch and not into master?

of course. Fixed :)

@coveralls
Copy link

coveralls commented Feb 29, 2024

Pull Request Test Coverage Report for Build 8278189299

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 1520 unchanged lines in 55 files lost coverage.
  • Overall coverage increased (+4.8%) to 63.075%

Files with Coverage Reduction New Missed Lines %
pdns/cachecleaner.hh 1 75.63%
pdns/pollmplexer.cc 1 81.76%
pdns/epollmplexer.cc 2 76.51%
pdns/logger.cc 2 78.49%
pdns/ws-api.cc 2 84.91%
ext/yahttp/yahttp/utility.hpp 2 36.47%
pdns/burtle.hh 2 96.32%
pdns/channel.hh 2 51.75%
pdns/proxy-protocol.cc 2 73.63%
pdns/dnswriter.cc 3 73.03%
Totals Coverage Status
Change from base Build 8262431453: 4.8%
Covered Lines: 41651
Relevant Lines: 59286

💛 - Coveralls

@@ -1,46 +0,0 @@
---
Copy link
Member

Choose a reason for hiding this comment

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

Don't you want to keep this one? Or is the workflow from master used? (I never know that, I wish there was an easy way to tell).

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm pretty sure the one from master is used.

Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure that's true, as I remember backporting these files to get proper packages for existing branches. I tried to find a definitive answer in GitHub's documentation but while I think I'm right I cannot find a clear answer.

Copy link
Member Author

Choose a reason for hiding this comment

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

I also looked in the docs today and found a 'main branch' note on some other events. No clarity about this one. I'll put it the file back.

Copy link
Contributor

Choose a reason for hiding this comment

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

on: push is based on the current commit that's pushed

on: pull_request is based on the merge of the base and head branches

on: pull_request_target is based on the base branch

on: issue_comment, on: schedule and a couple of other odd ones are based on the default branch

Copy link
Member

Choose a reason for hiding this comment

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

So we need to keep our stable branches up-to-date as far as workflows are concerned, except for the last events, if I reading this right?

Copy link
Member Author

Choose a reason for hiding this comment

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

right, so the yml that picks up the push tag event needs to be on the right branch, but then we quickly invoke the actual building workflows from master, so it's not to obad

Copy link
Contributor

@jsoref jsoref Mar 4, 2024

Choose a reason for hiding this comment

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

You definitely need to keep workflows current on any branches that you have, otherwise if there are security risks in them, you're at risk.

You can rely on:
on: workflow_dispatch and have that take an input, and have your other workflows do an if: ... to cause them not to do work on branches/tags if you're so inclined.

@Habbie
Copy link
Member Author

Habbie commented Mar 11, 2024

I have redone this from scratch

@Habbie Habbie added this to the auth-4.9.0 milestone Mar 12, 2024
@Habbie Habbie requested a review from omoerbeek March 12, 2024 10:11
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we could also remove tests for rec and dnsdist from this workflow, lines 59, 60, 147-247, and 261-268.

Copy link
Member Author

Choose a reason for hiding this comment

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

the matrix change makes that code dead code, and leaving the dead code in makes backporting patches easier, if we ever have to

Copy link
Member Author

Choose a reason for hiding this comment

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

removing the code makes github actions output easier to read, though.. it's a bit of a coin flip. I'll remove it and we'll see if it ever gets in the way

Copy link
Member Author

Choose a reason for hiding this comment

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

haha, I rebased on the github sysctl workaround and now I have a conflict (in build-and-test-all, though, but it does show the problem)

@Habbie Habbie merged commit aaf8bdc into PowerDNS:rel/auth-4.9.x Mar 14, 2024
29 checks passed
@Habbie Habbie deleted the auth-4.9.x-ci-specialise branch March 14, 2024 10:05
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.

None yet

6 participants