CI: Use the test scripts from Dosemu - #130
Conversation
|
This is okay to review now, please. |
d21b8a4 to
1c7c5e1
Compare
|
Should be better now. |
|
|
||
| set -e | ||
|
|
||
| sudo apt install -f -y dj32-dev |
There was a problem hiding this comment.
I do, but somehow it's gone by the time I need it for the deployment build, I couldn't figure out why. See https://github.com/dosemu2/comcom64/actions/runs/34953272048/job/104329103722#step:11:66
There was a problem hiding this comment.
There are many things that are
going wrongly:
dj32-dev is already the newest version (0.5-0~202608232226+202608240133~ubuntu22.04.1).
dj32-dev set to manually installed.
comcom32 is already the newest version (0.5-1).
comcom64 is already the newest version (0.5-1).
So it didn't even install the just-built comcoms,
taking the ones from PPA I suppose. And dj32-dev
was already installed.
Then you have this:
The following packages will be REMOVED:
comcom64-build-deps dj32-dev gcc-11-i686-linux-gnu gcc-i686-linux-gnu
Its strange that it removes whatever was
manually installed, but you need to figure
out why you have so many "already the newest
version" messages, that indicate a flaws.
There was a problem hiding this comment.
So it didn't even install the just-built comcoms,
taking the ones from PPA I suppose.
Well that's no good. Earlier I had used 'dch' to update the changelog as I'd noticed that when using the packaged binaries for deployment, the timestamps were old. I removed that when going back to the static build process. The thing is I have dosemu PPA added so that I can get dosemu and fdpp, and of course comcom can be found from there if the just built package is deemed older.
I'll have another try.
There was a problem hiding this comment.
It seems that gcc-multilib (just copy pasted from dosemu test prerequisites, but not actually used here) conflicts with comcom64-build-deps dj32-dev gcc-13-i686-linux-gnu gcc-i686-linux-gnu causing removal (even without -f / or -y flags to apt install).
Anyway I can remove that gcc-multilib package install (it's only used for process tests I think).
There was a problem hiding this comment.
have to go out now, back later.
There was a problem hiding this comment.
Ah, I am starting to recall that
gcc-multilib conflicts (and removes)
all i386 cross-compilers, and thus
dj32-dev.
We need to eliminate gcc-multilib
from everywhere, including dosemu2
itself! Can you give that a try?
There was a problem hiding this comment.
This seems better now as Comcom tests don't need multilib. On Dosemu multilib is only needed for one fpu test to produce the reference file. We could add that to git, but we'd probably need to compress it first as it's 57 MiB.
842ffc0 to
184c4c2
Compare
Test comcom32/64 using the suite from dosemu2
The build of comcom32/64 for the pages doesn't belong in the ci_test.sh script, so move it to a separate script.
|
Thanks! |
|
Okay, I understand what it is, will work on a fix. |
2 participants
1/ Test comcom32/64 using the suite from dosemu2
2/ Split the publishing build into a separate step from test.