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 GitHub Actions CI #9

Merged
merged 1 commit into from
Oct 17, 2023
Merged

Add GitHub Actions CI #9

merged 1 commit into from
Oct 17, 2023

Conversation

vlsi
Copy link

@vlsi vlsi commented Jun 20, 2023

Code changes should be tested, so there should be CI for that

@vlsi vlsi force-pushed the ci branch 3 times, most recently from 1d77e05 to 8ed0a47 Compare June 20, 2023 07:00
@jkesselm
Copy link
Contributor

Haven't used Git's actions, but this looks reasonable to me.

@vlsi
Copy link
Author

vlsi commented Oct 17, 2023

@jkesselm , care to merge?

@jkesselm jkesselm merged commit f08f127 into apache:xalan-j_2_7_1_maint Oct 17, 2023
@vlsi
Copy link
Author

vlsi commented Oct 17, 2023

Apparently, this PR and the others were reverted as you performed “reset master branch”

You should have reset the master branch before merging the PRs.

What is your plan now?

@garydgregory
Copy link
Member

Apparently, this PR and the others were reverted as you performed “reset master branch”

You should have reset the master branch before merging the PRs.

What is your plan now?

Please consider how you are addressing people. If your intent is rudeness, you've succeeded 😞

@stanio
Copy link
Contributor

stanio commented Oct 17, 2023

Apparently, this PR and the others were reverted as you performed “reset master branch”

This one has targeted and is currently in xalan-j_2_7_1_maint:

I don't know if it is the right target but it hasn't been reverted and has nothing to do with the reset of the master branch.

@vlsi
Copy link
Author

vlsi commented Oct 17, 2023

I don't know if it is the right target but it hasn't been reverted and has nothing to do with the reset of the master branch.

Indeed, my bad then. Sorry for that.

I assumed the mainline would be the master branch, I saw the merge notifications yet the changes are not present on the master branch, that is why I assumed the recently merged changes were just lost.

In any case, the changes should be transplanted to the master branch and/or the master branch itself should be reset again to the updated 271 branch.

@stanio
Copy link
Contributor

stanio commented Oct 17, 2023

Current xalan-j_2_7_1_maint could be merged (via a merge commit) into master.

@vlsi
Copy link
Author

vlsi commented Oct 17, 2023

Frankly speaking, I would suggest going with linear history instead of the merge commits which make xslt3 branch history much harder to read

@stanio
Copy link
Contributor

stanio commented Oct 17, 2023

I also would like not to see merge commits for single commit PRs but they are already a fact:

Merges for syncing branches are admissible and most often necessary, in my opinion.

@jkesselm
Copy link
Contributor

Or we can resubmit the change, making the PR against Master, Not sure if that's really any cleaner than the merge.

There is a presumption that patches to older versions (on the _maint branches) will be copied up to master/main, if they're still applicable. Since most patches are likely to be single commits, I think we just have to accept that this is sometimes going to happen. Readable history is a good thing, but that's legitimate history.

@jkesselm
Copy link
Contributor

I've changed the yaml file to invoke the set of tests we normally run for regression testing, minus conf.xsltc which is not currently compatible with the automation (since it doesn't mute the longstanding known issues as we do in the main conformance tests). I also had to change where xalan-test lived at least for the duration of the fulldist build.

So CI should now be running on the maint branch, and it should be safe to replicate/pull it over to master.

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.

4 participants