Working Windows build
This commit is contained in:
		
							parent
							
								
									6e4b31b4e9
								
							
						
					
					
						commit
						7d473488de
					
				
					 10 changed files with 37 additions and 10 deletions
				
			
		| 
						 | 
					@ -57,6 +57,19 @@ builds:
 | 
				
			||||||
    goarch: [arm64]
 | 
					    goarch: [arm64]
 | 
				
			||||||
    # No "upx", since it causes random core dumps, see
 | 
					    # No "upx", since it causes random core dumps, see
 | 
				
			||||||
    # https://github.com/binwiederhier/ntfy/issues/191#issuecomment-1083406546
 | 
					    # https://github.com/binwiederhier/ntfy/issues/191#issuecomment-1083406546
 | 
				
			||||||
 | 
					  -
 | 
				
			||||||
 | 
					    id: ntfy_windows_amd64
 | 
				
			||||||
 | 
					    binary: ntfy
 | 
				
			||||||
 | 
					    env:
 | 
				
			||||||
 | 
					      - CGO_ENABLED=0 # explicitly disable, since we don't need go-sqlite3
 | 
				
			||||||
 | 
					    tags: []
 | 
				
			||||||
 | 
					    ldflags:
 | 
				
			||||||
 | 
					      - "-X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}"
 | 
				
			||||||
 | 
					    goos: [windows]
 | 
				
			||||||
 | 
					    goarch: [amd64]
 | 
				
			||||||
 | 
					    hooks:
 | 
				
			||||||
 | 
					      post:
 | 
				
			||||||
 | 
					        - upx "{{ .Path }}" # apt install upx
 | 
				
			||||||
nfpms:
 | 
					nfpms:
 | 
				
			||||||
  -
 | 
					  -
 | 
				
			||||||
    package_name: ntfy
 | 
					    package_name: ntfy
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8,6 +8,10 @@ import (
 | 
				
			||||||
	"heckel.io/ntfy/util"
 | 
						"heckel.io/ntfy/util"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func init() {
 | 
				
			||||||
 | 
						commands = append(commands, cmdAccess)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const (
 | 
					const (
 | 
				
			||||||
	userEveryone = "everyone"
 | 
						userEveryone = "everyone"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
							
								
								
									
										13
									
								
								cmd/app.go
									
										
									
									
									
								
							
							
						
						
									
										13
									
								
								cmd/app.go
									
										
									
									
									
								
							| 
						 | 
					@ -19,6 +19,8 @@ const (
 | 
				
			||||||
	categoryServer = "Server commands"
 | 
						categoryServer = "Server commands"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					var commands = make([]*cli.Command, 0)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// New creates a new CLI application
 | 
					// New creates a new CLI application
 | 
				
			||||||
func New() *cli.App {
 | 
					func New() *cli.App {
 | 
				
			||||||
	return &cli.App{
 | 
						return &cli.App{
 | 
				
			||||||
| 
						 | 
					@ -30,16 +32,7 @@ func New() *cli.App {
 | 
				
			||||||
		Reader:                 os.Stdin,
 | 
							Reader:                 os.Stdin,
 | 
				
			||||||
		Writer:                 os.Stdout,
 | 
							Writer:                 os.Stdout,
 | 
				
			||||||
		ErrWriter:              os.Stderr,
 | 
							ErrWriter:              os.Stderr,
 | 
				
			||||||
		Commands: []*cli.Command{
 | 
							Commands:               commands,
 | 
				
			||||||
			// Server commands
 | 
					 | 
				
			||||||
			cmdServe,
 | 
					 | 
				
			||||||
			cmdUser,
 | 
					 | 
				
			||||||
			cmdAccess,
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
			// Client commands
 | 
					 | 
				
			||||||
			cmdPublish,
 | 
					 | 
				
			||||||
			cmdSubscribe,
 | 
					 | 
				
			||||||
		},
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,6 +12,10 @@ import (
 | 
				
			||||||
	"strings"
 | 
						"strings"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func init() {
 | 
				
			||||||
 | 
						commands = append(commands, cmdPublish)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var cmdPublish = &cli.Command{
 | 
					var cmdPublish = &cli.Command{
 | 
				
			||||||
	Name:      "publish",
 | 
						Name:      "publish",
 | 
				
			||||||
	Aliases:   []string{"pub", "send", "trigger"},
 | 
						Aliases:   []string{"pub", "send", "trigger"},
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,6 +14,10 @@ import (
 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func init() {
 | 
				
			||||||
 | 
						commands = append(commands, cmdServe)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var flagsServe = []cli.Flag{
 | 
					var flagsServe = []cli.Flag{
 | 
				
			||||||
	&cli.StringFlag{Name: "config", Aliases: []string{"c"}, EnvVars: []string{"NTFY_CONFIG_FILE"}, Value: "/etc/ntfy/server.yml", DefaultText: "/etc/ntfy/server.yml", Usage: "config file"},
 | 
						&cli.StringFlag{Name: "config", Aliases: []string{"c"}, EnvVars: []string{"NTFY_CONFIG_FILE"}, Value: "/etc/ntfy/server.yml", DefaultText: "/etc/ntfy/server.yml", Usage: "config file"},
 | 
				
			||||||
	altsrc.NewStringFlag(&cli.StringFlag{Name: "base-url", Aliases: []string{"B"}, EnvVars: []string{"NTFY_BASE_URL"}, Usage: "externally visible base URL for this host (e.g. https://ntfy.sh)"}),
 | 
						altsrc.NewStringFlag(&cli.StringFlag{Name: "base-url", Aliases: []string{"B"}, EnvVars: []string{"NTFY_BASE_URL"}, Usage: "externally visible base URL for this host (e.g. https://ntfy.sh)"}),
 | 
				
			||||||
| 
						 | 
					@ -13,6 +13,10 @@ import (
 | 
				
			||||||
	"strings"
 | 
						"strings"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func init() {
 | 
				
			||||||
 | 
						commands = append(commands, cmdSubscribe)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var cmdSubscribe = &cli.Command{
 | 
					var cmdSubscribe = &cli.Command{
 | 
				
			||||||
	Name:      "subscribe",
 | 
						Name:      "subscribe",
 | 
				
			||||||
	Aliases:   []string{"sub"},
 | 
						Aliases:   []string{"sub"},
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,7 +11,12 @@ import (
 | 
				
			||||||
	"strings"
 | 
						"strings"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func init() {
 | 
				
			||||||
 | 
						commands = append(commands, cmdUser)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var flagsUser = userCommandFlags()
 | 
					var flagsUser = userCommandFlags()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var cmdUser = &cli.Command{
 | 
					var cmdUser = &cli.Command{
 | 
				
			||||||
	Name:      "user",
 | 
						Name:      "user",
 | 
				
			||||||
	Usage:     "Manage/show users",
 | 
						Usage:     "Manage/show users",
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue