Skip to content

Commit c053a6a

Browse files
chaseflemingchasefleming
committed
Merge
2 parents dbb5eec + de7dabc commit c053a6a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1353
-438
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
name: Reporting a Problem/Bug
33
about: Reporting a Problem/Bug
44
title: ''
5-
labels: bug, Feedback
6-
assignees: chasefleming
7-
5+
labels: bug
86
---
97
### Instructions
108

‎.github/ISSUE_TEMPLATE/feature-request.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
name: Requesting a Feature or Improvement
33
about: "For feature requests. Please search for existing issues first. Also see CONTRIBUTING.md"
44
title: ''
5-
labels: Feedback, Feature
6-
assignees: chasefleming
7-
5+
labels: Feature
86
---
97

108
## Instructions

‎.github/workflows/build-release.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ jobs:
2626
echo 'LILICO_TOKEN=${{ secrets.LILICO_TOKEN }}' >> .release-env
2727
echo 'APP_VERSION=$(basename ${GITHUB_REF})' >> .release-env
2828
echo 'BUILD_TIME=$(date --iso-8601=seconds)' >> .release-env
29-
echo 'VERSION=${{ github.ref_name }}' >> .release-env
30-
echo 'COMMIT=${{ github.sha }}' >> .release-env
29+
echo 'VERSION=${{ github.event.release.tag_name }}' >> .release-env
3130
echo 'GITHUB_TOKEN=${{ secrets.FLOW_CLI_RELEASE }}' >> .release-env
3231
- name: Build and Release
3332
run: make release

‎.goreleaser.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ builds:
3232
flags:
3333
- -mod=readonly
3434
ldflags:
35-
- -X github.com/onflow/flow-cli/build.commit={{ .Env.COMMIT }} -X github.com/onflow/flow-cli/build.semver={{ .Env.VERSION }} -X github.com/onflow/flow-cli/internal/command.mixpanelToken={{ .Env.MIXPANEL_PROJECT_TOKEN }} -X github.com/onflow/flow-cli/internal/accounts.accountToken={{ .Env.LILICO_TOKEN }}
35+
- -X github.com/onflow/flow-cli/build.semver={{ .Env.VERSION }} -X github.com/onflow/flow-cli/internal/command.mixpanelToken={{ .Env.MIXPANEL_PROJECT_TOKEN }} -X github.com/onflow/flow-cli/internal/accounts.accountToken={{ .Env.LILICO_TOKEN }}
3636

3737
archives:
3838
- id: golang-cross

‎Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
PACKAGE_NAME := github.com/onflow/flow-cli
33
GOLANG_CROSS_VERSION ?= v1.22.0
44

5-
# The short Git commit hash
6-
SHORT_COMMIT := $(shell git rev-parse --short HEAD)
7-
# The Git commit hash
8-
COMMIT := $(shell git rev-parse HEAD)
95
# The tag of the current commit, otherwise empty
106
VERSION := $(shell git describe --tags --abbrev=0 --exact-match 2>/dev/null)
117
# Name of the cover profile
@@ -63,7 +59,7 @@ $(BINARY):
6359
GO111MODULE=on go build \
6460
-trimpath \
6561
-ldflags \
66-
"-X github.com/onflow/flow-cli/build.commit=$(COMMIT) -X github.com/onflow/flow-cli/build.semver=$(VERSION) -X github.com/onflow/flow-cli/internal/accounts.accountToken=${ACCOUNT_TOKEN}"\
62+
"-X github.com/onflow/flow-cli/build.semver=$(VERSION) -X github.com/onflow/flow-cli/internal/accounts.accountToken=${ACCOUNT_TOKEN}"\
6763
-o $(BINARY) ./cmd/flow
6864

6965
.PHONY: versioned-binaries

‎cmd/flow/main.go

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ func main() {
5656
}
5757

5858
// quick commands
59-
quick.InitCommand.AddToParent(cmd)
6059
quick.DeployCommand.AddToParent(cmd)
6160
quick.RunCommand.AddToParent(cmd)
6261

‎go.mod

+18-7
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ go 1.22
55
toolchain go1.22.3
66

77
require (
8+
github.com/charmbracelet/bubbles v0.18.0
9+
github.com/charmbracelet/bubbletea v0.25.0
810
github.com/dukex/mixpanel v1.0.1
9-
github.com/getsentry/sentry-go v0.27.0
11+
github.com/getsentry/sentry-go v0.28.0
1012
github.com/go-git/go-git/v5 v5.11.0
1113
github.com/google/go-github v17.0.0+incompatible
1214
github.com/gosuri/uilive v0.0.4
@@ -19,19 +21,20 @@ require (
1921
github.com/onflow/contract-updater/lib/go/templates v1.0.1
2022
github.com/onflow/fcl-dev-wallet v0.8.0-stable-cadence.1
2123
github.com/onflow/flixkit-go v1.2.1-cadence-v1-preview.17
22-
github.com/onflow/flow-core-contracts/lib/go/templates v1.0.0
24+
github.com/onflow/flow-core-contracts/lib/go/templates v1.2.4-0.20231016154253-a00dbf7c061f
2325
github.com/onflow/flow-emulator v1.0.0-preview.31
2426
github.com/onflow/flow-evm-gateway v0.15.0
2527
github.com/onflow/flow-go v0.35.10-crescendo-preview.25.0.20240604172940-c504b454e576
2628
github.com/onflow/flow-go-sdk v1.0.0-preview.34
29+
github.com/onflow/flowkit v1.19.0
2730
github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.23
2831
github.com/onflow/go-ethereum v1.13.4
2932
github.com/onflowser/flowser/v3 v3.2.1-0.20240131200229-7d4d22715f48
3033
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
3134
github.com/pkg/errors v0.9.1
3235
github.com/psiemens/sconfig v0.1.0
3336
github.com/radovskyb/watcher v1.0.7
34-
github.com/rs/zerolog v1.32.0
37+
github.com/rs/zerolog v1.33.0
3538
github.com/sergi/go-diff v1.3.1
3639
github.com/spf13/afero v1.10.0
3740
github.com/spf13/cobra v1.8.0
@@ -55,6 +58,8 @@ require (
5558
github.com/SaveTheRbtz/mph v0.1.1-0.20240117162131-4166ec7869bc // indirect
5659
github.com/StackExchange/wmi v1.2.1 // indirect
5760
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
61+
github.com/atotto/clipboard v0.1.4 // indirect
62+
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
5863
github.com/beorn7/perks v1.0.1 // indirect
5964
github.com/bits-and-blooms/bitset v1.10.0 // indirect
6065
github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect
@@ -63,6 +68,7 @@ require (
6368
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
6469
github.com/cespare/xxhash v1.1.0 // indirect
6570
github.com/cespare/xxhash/v2 v2.2.0 // indirect
71+
github.com/charmbracelet/lipgloss v0.9.1 // indirect
6672
github.com/chzyer/readline v1.5.0 // indirect
6773
github.com/cloudflare/circl v1.3.3 // indirect
6874
github.com/cockroachdb/errors v1.9.1 // indirect
@@ -72,6 +78,7 @@ require (
7278
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
7379
github.com/consensys/bavard v0.1.13 // indirect
7480
github.com/consensys/gnark-crypto v0.12.1 // indirect
81+
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
7582
github.com/coreos/go-semver v0.3.0 // indirect
7683
github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
7784
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
@@ -157,7 +164,7 @@ require (
157164
github.com/karalabe/usb v0.0.2 // indirect
158165
github.com/kevinburke/go-bindata v3.24.0+incompatible // indirect
159166
github.com/kevinburke/ssh_config v1.2.0 // indirect
160-
github.com/klauspost/compress v1.17.4 // indirect
167+
github.com/klauspost/compress v1.17.7 // indirect
161168
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
162169
github.com/kr/pretty v0.3.1 // indirect
163170
github.com/kr/text v0.2.0 // indirect
@@ -167,9 +174,11 @@ require (
167174
github.com/libp2p/go-msgio v0.3.0 // indirect
168175
github.com/lmars/go-slip10 v0.0.0-20190606092855-400ba44fee12 // indirect
169176
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
177+
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
170178
github.com/magiconair/properties v1.8.7 // indirect
171179
github.com/mattn/go-colorable v0.1.13 // indirect
172180
github.com/mattn/go-isatty v0.0.20 // indirect
181+
github.com/mattn/go-localereader v0.0.1 // indirect
173182
github.com/mattn/go-runewidth v0.0.15 // indirect
174183
github.com/mattn/go-tty v0.0.4 // indirect
175184
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
@@ -178,6 +187,10 @@ require (
178187
github.com/mitchellh/mapstructure v1.5.0 // indirect
179188
github.com/mmcloughlin/addchain v0.4.0 // indirect
180189
github.com/mr-tron/base58 v1.2.0 // indirect
190+
github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
191+
github.com/muesli/cancelreader v0.2.2 // indirect
192+
github.com/muesli/reflow v0.3.0 // indirect
193+
github.com/muesli/termenv v0.15.2 // indirect
181194
github.com/multiformats/go-base32 v0.1.0 // indirect
182195
github.com/multiformats/go-base36 v0.2.0 // indirect
183196
github.com/multiformats/go-multiaddr v0.12.2 // indirect
@@ -189,11 +202,9 @@ require (
189202
github.com/olekukonko/tablewriter v0.0.5 // indirect
190203
github.com/onflow/atree v0.7.0-rc.2 // indirect
191204
github.com/onflow/crypto v0.25.1 // indirect
192-
github.com/onflow/flow-core-contracts/lib/go/contracts v1.1.0 // indirect
205+
github.com/onflow/flow-core-contracts/lib/go/contracts v1.2.4-0.20231016154253-a00dbf7c061f // indirect
193206
github.com/onflow/flow-ft/lib/go/contracts v1.0.0 // indirect
194-
github.com/onflow/flow-ft/lib/go/templates v1.0.0 // indirect
195207
github.com/onflow/flow-nft/lib/go/contracts v1.2.1 // indirect
196-
github.com/onflow/flow-nft/lib/go/templates v1.2.0 // indirect
197208
github.com/onflow/flow/protobuf/go/flow v0.4.4 // indirect
198209
github.com/onflow/nft-storefront/lib/go/contracts v1.0.0 // indirect
199210
github.com/onflow/sdks v0.5.1-0.20230912225508-b35402f12bba // indirect

0 commit comments

Comments
 (0)