Merge pull request onflow#5157 from onflow/petera/fix-without-netgo-s…

…emver

[CI] Use build tag for without-netgo

Makefile

@@ -19,7 +19,7 @@ ifeq (${IMAGE_TAG},)
 IMAGE_TAG := ${SHORT_COMMIT}
 endif
 
-IMAGE_TAG_NO_NETGO := $(IMAGE_TAG)-without-netgo
+IMAGE_TAG_NO_NETGO := $(IMAGE_TAG)+without-netgo
 
 # Name of the cover profile
 COVER_PROFILE := coverage.txt

engine/execution/ingestion/stop/stop_control_test.go

@@ -865,4 +865,9 @@ func Test_StopControlWorkers(t *testing.T) {
 func TestPatchedVersion(t *testing.T) {
 	require.True(t, semver.New("0.31.20").LessThan(*semver.New("0.31.21")))
 	require.True(t, semver.New("0.31.20-patch.1").LessThan(*semver.New("0.31.20"))) // be careful with this one
+	require.True(t, semver.New("0.31.20-without-netgo").LessThan(*semver.New("0.31.20")))
+
+	// a special build created with "+" would not change the version priority for standard and pre-release versions
+	require.True(t, semver.New("0.31.20+without-netgo").Equal(*semver.New("0.31.20")))
+	require.True(t, semver.New("0.31.20-patch.1+without-netgo").Equal(*semver.New("0.31.20-patch.1")))
 }