Skip to content

Ci 60 - #303

Draft
andrewbird wants to merge 5 commits into
dosemu2:masterfrom
andrewbird:ci-60
Draft

Ci 60#303
andrewbird wants to merge 5 commits into
dosemu2:masterfrom
andrewbird:ci-60

Conversation

@andrewbird

@andrewbird andrewbird commented Jul 28, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Switch to 26.04 and re-enable the processor testing

@stsp

stsp commented Jul 29, 2026

Copy link
Copy Markdown
Member

Ok, I'll better try to re-build gcc-ia16.
We've seen recently that LP works -
maybe it still does...

@andrewbird

andrewbird commented Jul 29, 2026

Copy link
Copy Markdown
Member Author

Ok, I'll better try to re-build gcc-ia16.

Actually, Tkchia has fixed all the bugs in his upstream so we could switch to that instead?

@andrewbird

andrewbird commented Jul 29, 2026

Copy link
Copy Markdown
Member Author

But I don't think he has any intention of adding amd64v3 packages, so apart from the benefit of you not needing to maintain it and a couple of new functions/tests, there's no real difference.

@stsp

stsp commented Jul 29, 2026

Copy link
Copy Markdown
Member

Actually, Tkchia has fixed all the bugs in his upstream so we could switch to that instead?

Please, if you want to do anything
with gcc-ia16 - I'll happily transfer
everything I can. Otherwise please
don't tell me about his "fixes", as I've
already seen them.

@stsp

stsp commented Jul 29, 2026

Copy link
Copy Markdown
Member

Or do you mean he provides an
upstream builds in PPA? In this
case go ahead and switch, and
I'll just delete my PPA.

@andrewbird

andrewbird commented Jul 29, 2026

Copy link
Copy Markdown
Member Author

Yes he has builds for Ubuntu LTS releases in PPA.

@stsp

stsp commented Jul 29, 2026

Copy link
Copy Markdown
Member

Including 26.04?
Then what is the problem?

@andrewbird

andrewbird commented Jul 29, 2026

Copy link
Copy Markdown
Member Author

Yes, he has 26.04.

@stsp

stsp commented Jul 29, 2026

Copy link
Copy Markdown
Member

Great, please switch then.

@andrewbird

andrewbird commented Jul 29, 2026

Copy link
Copy Markdown
Member Author

okay will do that once I get dosemu2 CI done on 26.04.

Next question is nasm-segelf required now or not, as it seems that meson build doesn't use it, but make still wants it?

@stsp

stsp commented Jul 30, 2026

Copy link
Copy Markdown
Member

No, make just says its not there,
but you can remove that msg.

@andrewbird

andrewbird commented Jul 30, 2026

Copy link
Copy Markdown
Member Author

I was mistaken, it's not nasm-segelf missing that's my install problem (diagnostics from mk-build-deps very poor), it's actually dj64dev which seems to exist in two PPAs. In stsp-0 you've updated it so the amd64v3 package exists, in dosemu2 it hasn't been updated since jul-22. Ideally I'd like it in dosemu2 but I'd settle for just one place whichever.

@stsp

stsp commented Jul 30, 2026

Copy link
Copy Markdown
Member

Thanks, rebuilding.
I am also still trying to build
gcc-ia16 for you. But, as always,
that's a PITA.

@stsp

stsp commented Jul 30, 2026

Copy link
Copy Markdown
Member

Everything is updated.

@andrewbird

andrewbird commented Jul 30, 2026

Copy link
Copy Markdown
Member Author

Cool, great, thanks!

@andrewbird
CI: Use 26.04 Github runner (subarch amd64v3)
8bb496b 
1/ Switch to the 26.04 Github runner

2/ Some repositories (maybe external) don't have packages for the new
   Ubuntu subarchitecture "amd64v3". Whilst apparently it is bad practice
   and potentially unreliable to mix plain amd64 packages with amd64v3
   where linking will take place, it's okay if the app is self contained.
   Fortunately this is the case for us, where both problem packages are
   compilers producing non-host binaries. Add detection that the host
   desires amd64v3 packages, and tweak the problem repository definitions
   to access plain amd64 packages.

3/ Avoid doing apt-add-repository's automatic apt update. Run one update
   after adding multiple repositories.
@andrewbird
CI: Copy some workflow items from Dosemu2
ff9be49 
1/ Add an ACL for KVM use
2/ Add most of the info block
3/ Upload the failure logs to Artifacts
@andrewbird
CI: Only need one script for test setup
9942e4f 
1/ Stop sourcing the mostly empty ci_test_prereq.sh
2/ Move the contents of ci_test_prereq.sh to ci_setup_test.sh
3/ Rename ci_setup_test.sh to ci_test_prereq.sh and change the workflow
   step to use it.
@andrewbird
CI: Allow CI test to use another repo for dosemu
834e6ed 
Useful for testing when a fix in dosemu needs testing from FDPP CI before
it should be merged into dosemu.
@andrewbird
CI: Enable the processor tests again
96e0f40 
1/ The processor tests got moved to a separate file, so they
   were no longer being run in this repo.
2/ The processor tests now make the test binaries themselves.
3/ Install Watcom
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@andrewbird @stsp