X Tutup
Skip to content

straight up comparison between the two reops#17

Merged
jbrichau merged 58 commits intoGsDevKit:masterfrom
SeasideSt:gsdevkit-merge
Feb 14, 2021
Merged

straight up comparison between the two reops#17
jbrichau merged 58 commits intoGsDevKit:masterfrom
SeasideSt:gsdevkit-merge

Conversation

@dalehenrich
Copy link
Member

No description provided.

Johan Brichau added 25 commits May 21, 2020 12:02
… tests package so we execute the tests on all platforms
…ey in the filetree format directly because of the package file name convention violation)
…wards instead of a 'file' spec hack (which breaks working in Tode)
…e to solve issues with working with this package in the tode git tools
…k this is really necessary at all. Will need to mention this in the changelog and create a version increase to signal this change of behaviour on Pharo
…inary-file-are-nil-rather-than-an-empty-instance-of-ByteArray

Fix reading contents of empty binary file
@jbrichau
Copy link
Member

@dalehenrich the merge conflict points to differences in the packaging I made here: SeasideSt@9d4fe1a

This was done to ease maintenance, since the 'filename' difference was off-putting tools in Tode. I will fix the baseline with that in mind and if you are happy, you can hit the merge button ;-)

@dalehenrich
Copy link
Member Author

@dalehenrich
Copy link
Member Author

Looks like the thisContext test is failing for 2.4.x. I don't think that it is really necessary to support 2.4.x moving forward ... so removing it from the travis lineup would not be a crime :)

@jbrichau
Copy link
Member

jbrichau commented Feb 2, 2021

Haha, indeed. I will just remove that version from the test lineup.
Getting back to this asap ;-)

@dalehenrich
Copy link
Member Author

Haha, and the travis build is still running, but it seems to be passing, so it's looking good ... when travis finishes I will want to manually do a reload from the old version to the new version to see if there are any hiccups (actually I can do this at any time and will when I find the time) ...

@dalehenrich
Copy link
Member Author

... oh, my browser hadn't updated ... rerunning the one test that failed ...

@jbrichau
Copy link
Member

jbrichau commented Feb 7, 2021

@dalehenrich I added your lineup of gs3.7 to 3.9 to the baseline (future proofness? :-) ). The difference now, besides indentation, is about the last statement:

	spec
		for:
			#(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x' #'gs3.7.x' #'gs3.8.x' #'gs3.9.x')
		do: [ 
			spec
				package: 'Grease-Tests-GemStone-Core'
				with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]

vs

spec
    for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x')
    do: [ 
      spec
        package: 'Grease-Tests-GemStone32-Core'
		    with:[ spec requires: 'Grease-Tests-Core' ];
		  package: 'Grease-Tests-Core'
        	 with: [ spec includes: 'Grease-Tests-GemStone32-Core' ] ]

This is the change I referred to earlier.

Unless you see issues with that, I will just push the baseline of SeasideSt/Grease

@dalehenrich
Copy link
Member Author

I guess, I can't tell quite what you are doing ... Removing the package 'Grease-Tests-GemStone32-Core'? ... If things are working correctly then I suppose it is cool :)

@jbrichau
Copy link
Member

jbrichau commented Feb 8, 2021

I added it :)
It used to be done with that ‘file:’ message.

@dalehenrich
Copy link
Member Author

I just did a test load of SeasideSt/Grease:gsdevkit-merge into a 3.6.0 stone with GsDevKit/Grease:master loaded and it loaded without error (yeah!), when I looked at baselineGemStone: , I saw the following:

	spec
		for:
			#(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x' #'gs3.7.x' #'gs3.8.x' #'gs3.9.x')
		do: [ 
			spec
				package: 'Grease-Tests-GemStone32-Core'
					with: [ spec requires: 'Grease-Tests-Core' ];
				package: 'Grease-Tests-Core'
					with: [ spec includes: 'Grease-Tests-GemStone32-Core' ] ]

Other than the fact that I thought that you had done the opposite :)

I ran the tests and they are all green, so merge away ...

@jbrichau jbrichau merged commit 5a4bfb4 into GsDevKit:master Feb 14, 2021
@jbrichau jbrichau deleted the gsdevkit-merge branch February 14, 2021 09:23
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.

3 participants

X Tutup