From f862341997e7177660579580c3f82315099f9168 Mon Sep 17 00:00:00 2001 From: binwiederhier Date: Tue, 28 Feb 2023 11:57:49 -0500 Subject: [PATCH] Fix test, release notes --- cmd/publish.go | 1 - cmd/publish_test.go | 5 ++--- cmd/serve_test.go | 1 - docs/releases.md | 13 ++++++++++++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/cmd/publish.go b/cmd/publish.go index be00dfd1..aff80656 100644 --- a/cmd/publish.go +++ b/cmd/publish.go @@ -40,7 +40,6 @@ var flagsPublish = append( &cli.BoolFlag{Name: "wait-cmd", Aliases: []string{"wait_cmd", "cmd", "done"}, EnvVars: []string{"NTFY_WAIT_CMD"}, Usage: "run command and wait until it finishes before publishing"}, &cli.BoolFlag{Name: "no-cache", Aliases: []string{"no_cache", "C"}, EnvVars: []string{"NTFY_NO_CACHE"}, Usage: "do not cache message server-side"}, &cli.BoolFlag{Name: "no-firebase", Aliases: []string{"no_firebase", "F"}, EnvVars: []string{"NTFY_NO_FIREBASE"}, Usage: "do not forward message to Firebase"}, - &cli.BoolFlag{Name: "env-topic", Aliases: []string{"env_topic", "P"}, EnvVars: []string{"NTFY_ENV_TOPIC"}, Usage: "use topic from NTFY_TOPIC env variable"}, &cli.BoolFlag{Name: "quiet", Aliases: []string{"q"}, EnvVars: []string{"NTFY_QUIET"}, Usage: "do not print message"}, ) diff --git a/cmd/publish_test.go b/cmd/publish_test.go index 6c3b9ce2..6fe2d000 100644 --- a/cmd/publish_test.go +++ b/cmd/publish_test.go @@ -86,7 +86,6 @@ func TestCLI_Publish_All_The_Things(t *testing.T) { } func TestCLI_Publish_Wait_PID_And_Cmd(t *testing.T) { - t.Parallel() s, port := test.StartServer(t) defer test.StopServer(t, s, port) topic := fmt.Sprintf("http://127.0.0.1:%d/mytopic", port) @@ -135,7 +134,7 @@ func TestCLI_Publish_Wait_PID_And_Cmd(t *testing.T) { // Test: Successful command with NTFY_TOPIC app, _, stdout, _ = newTestApp() - require.Nil(t, app.Run([]string{"ntfy", "publish", "--env-topic", "--cmd", "echo", "hi there"})) + require.Nil(t, app.Run([]string{"ntfy", "publish", "--cmd", "echo", "hi there"})) m = toMessage(t, stdout.String()) require.Equal(t, "mytopic", m.Topic) @@ -144,7 +143,7 @@ func TestCLI_Publish_Wait_PID_And_Cmd(t *testing.T) { require.Nil(t, sleep.Start()) go sleep.Wait() // Must be called to release resources app, _, stdout, _ = newTestApp() - require.Nil(t, app.Run([]string{"ntfy", "publish", "--env-topic", "--wait-pid", strconv.Itoa(sleep.Process.Pid)})) + require.Nil(t, app.Run([]string{"ntfy", "publish", "--wait-pid", strconv.Itoa(sleep.Process.Pid)})) m = toMessage(t, stdout.String()) require.Regexp(t, `Process with PID \d+ exited after .+ms`, m.Message) } diff --git a/cmd/serve_test.go b/cmd/serve_test.go index fceed471..774166c3 100644 --- a/cmd/serve_test.go +++ b/cmd/serve_test.go @@ -22,7 +22,6 @@ func init() { } func TestCLI_Serve_Unix_Curl(t *testing.T) { - t.Parallel() sockFile := filepath.Join(t.TempDir(), "ntfy.sock") configFile := newEmptyFile(t) // Avoid issues with existing server.yml file on system go func() { diff --git a/docs/releases.md b/docs/releases.md index 708e28dc..eca56ef0 100644 --- a/docs/releases.md +++ b/docs/releases.md @@ -3,13 +3,24 @@ Binaries for all releases can be found on the GitHub releases pages for the [ntf and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/releases). ## ntfy server v2.1.1 (UNRELEASED) +Released March 1, 2023 + +This is a tiny release with a few bug fixes, but it's big for me personally. After almost three months of work, today +I am finally launching the paid plans on ntfy.sh: You are now able to purchase three different plans that'll give you +higher rate limits (messages, emails, attachment sizes, ...), and also give you the ability to reserve topic names for +your personal use. You can check out the pricing, and [purchase plans through the web app](https://ntfy.sh/app) (use +promo code `MYTOPIC` for a **50% discount**, limited time only). + +And as I've said many times: Do not worry. **ntfy will always stay open source**, and that includes all features. There +are no closed-source features. So if you'd like to run your own server, you can! **Bug fixes + maintenance:** -* Remove health check from `Dockerfile` and [document it](config.md#health-checks) ([#635](https://github.com/binwiederhier/ntfy/issues/635), thanks to [@Andersbiha](https://github.com/Andersbiha)) * Fix panic when using Firebase without users ([#641](https://github.com/binwiederhier/ntfy/issues/641), thanks to [u/heavybell](https://www.reddit.com/user/heavybell/) for reporting) +* Remove health check from `Dockerfile` and [document it](config.md#health-checks) ([#635](https://github.com/binwiederhier/ntfy/issues/635), thanks to [@Andersbiha](https://github.com/Andersbiha)) * Upgrade dialog: Disable submit button for free tier (no ticket) * Allow multiple `log-level-overrides` on the same field (no ticket) +* Actually remove `ntfy publish --env-topic` flag (as per [deprecations](deprecations.md), no ticket) ## ntfy server v2.1.0 Released February 25, 2023