Merge pull request #80 from vitessio/fix-java

frouioui · web-flow · commit 6bf394e96061 · 2024-02-20T15:31:15.000-06:00
Quick fix to the java step
diff --git a/go/interactive/release/java.go b/go/interactive/release/java.go
@@ -34,6 +34,7 @@ func JavaReleaseItem(ctx context.Context) *ui.MenuItem {
 		Act:    javaReleaseAct,
 		Update: javaReleaseUpdate,
 		IsDone: state.Issue.JavaRelease,
+		Ignore: !state.VitessRelease.GA,
 	}
 }
 
diff --git a/go/releaser/release/java.go b/go/releaser/release/java.go
@@ -40,7 +40,7 @@ func JavaRelease(state *releaser.State) (*logging.ProgressLogging, func() string
 		git.CorrectCleanRepo(state.VitessRelease.Repo)
 		git.Checkout(lowerCaseRelease)
 
-		if !strings.Contains(state.VitessRelease.Repo, "vitessio/vitess") {
+		if strings.Contains(state.VitessRelease.Repo, "vitessio/vitess") {
 			pl.NewStepf("Do the Java release")
 			cmd := exec.Command("/bin/sh", "-c", "eval $(gpg-agent --daemon --no-grab --write-env-file $HOME/.gpg-agent-info); export GPG_TTY=$(tty); export GPG_AGENT_INFO; export MAVEN_OPTS=\"--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED\"; mvn clean deploy -P release -DskipTests;",
 			)

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ func JavaReleaseItem(ctx context.Context) *ui.MenuItem {`
`34`	`34`	`Act: javaReleaseAct,`
`35`	`35`	`Update: javaReleaseUpdate,`
`36`	`36`	`IsDone: state.Issue.JavaRelease,`
	`37`	`+ Ignore: !state.VitessRelease.GA,`
`37`	`38`	`}`
`38`	`39`	`}`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func JavaRelease(state releaser.State) (logging.ProgressLogging, func() string`
`40`	`40`	`git.CorrectCleanRepo(state.VitessRelease.Repo)`
`41`	`41`	`git.Checkout(lowerCaseRelease)`
`42`	`42`
`43`		`- if !strings.Contains(state.VitessRelease.Repo, "vitessio/vitess") {`
	`43`	`+ if strings.Contains(state.VitessRelease.Repo, "vitessio/vitess") {`
`44`	`44`	`pl.NewStepf("Do the Java release")`
`45`	`45`	`cmd := exec.Command("/bin/sh", "-c", "eval $(gpg-agent --daemon --no-grab --write-env-file $HOME/.gpg-agent-info); export GPG_TTY=$(tty); export GPG_AGENT_INFO; export MAVEN_OPTS=\"--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED\"; mvn clean deploy -P release -DskipTests;",`
`46`	`46`	`)`