Skip to content

Commit

Permalink
Added version and moved to CLI format
Browse files Browse the repository at this point in the history
  • Loading branch information
Connor Daly committed Jul 18, 2022
1 parent ca5ed43 commit 407c901
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# ref. https://goreleaser.com/customization/build/
builds:
- id: avalanche-network-runner
main: ./cmd/avalanche-network-runner
main: ./main.go
binary: avalanche-network-runner
flags:
- -v
ldflags:
- -X 'github.com/ava-labs/avalanche-network-runner/cmd.Version={{.Version}}'
ignore:
- goos: darwin
goarch: 386
Expand Down
1 change: 1 addition & 0 deletions VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.1.4
File renamed without changes.
File renamed without changes.
13 changes: 8 additions & 5 deletions cmd/avalanche-network-runner/main.go → cmd/root.go
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
// Copyright (C) 2019-2022, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.

package main
package cmd

import (
"fmt"
"os"

"github.com/ava-labs/avalanche-network-runner/cmd/avalanche-network-runner/control"
"github.com/ava-labs/avalanche-network-runner/cmd/avalanche-network-runner/ping"
"github.com/ava-labs/avalanche-network-runner/cmd/avalanche-network-runner/server"
"github.com/ava-labs/avalanche-network-runner/cmd/control"
"github.com/ava-labs/avalanche-network-runner/cmd/ping"
"github.com/ava-labs/avalanche-network-runner/cmd/server"
"github.com/spf13/cobra"
)

var Version = ""

var rootCmd = &cobra.Command{
Use: "avalanche-network-runner",
Short: "avalanche-network-runner commands",
SuggestFor: []string{"network-runner"},
Version: Version,
}

func init() {
Expand All @@ -31,7 +34,7 @@ func init() {
)
}

func main() {
func Execute() {
if err := rootCmd.Execute(); err != nil {
fmt.Fprintf(os.Stderr, "avalanche-network-runner failed %v\n", err)
os.Exit(1)
Expand Down
File renamed without changes.
11 changes: 11 additions & 0 deletions main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Copyright (C) 2022, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.
package main

import (
"github.com/ava-labs/avalanche-network-runner/cmd"
)

func main() {
cmd.Execute()
}
16 changes: 16 additions & 0 deletions scripts/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash

# Run with ./scripts/build.sh <optional_version>

if ! [[ "$0" =~ scripts/build.sh ]]; then
echo "must be run from repository root"
exit 1
fi

if [ $# -eq 0 ] ; then
VERSION=`cat VERSION`
else
VERSION=$1
fi

go build -v -ldflags="-X 'github.com/ava-labs/avalanche-network-runner/cmd.Version=$VERSION'" -o bin/avalanche-network-runner

0 comments on commit 407c901

Please sign in to comment.