Merge pull request #2016 from onflow/cf/merge-m-scaffolds

Update branch with master

Author: chasefleming

.github/workflows/add-issues-to-devx-project.yml

@@ -12,5 +12,5 @@ jobs:
     steps:
       - uses: actions/add-to-project@v1.0.2
         with:
-          project-url: https://github.com/orgs/onflow/projects/13
+          project-url: https://github.com/orgs/onflow/projects/85
           github-token: ${{ secrets.GH_ACTION_FOR_PROJECTS }}

.github/workflows/build-release.yaml

@@ -4,6 +4,9 @@ on:
   release:
     types: [published]
 
+env:
+  GO_VERSION: "1.24"
+
 jobs:
   release:
     name: Release Go Binary
@@ -12,12 +15,12 @@ jobs:
       # See https://github.com/onflow/flow-cli/pull/1431 for more information
       - name: Delete unnecessary cache
         run: rm -rf ${RUNNER_TOOL_CACHE}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: Codebase security check
         continue-on-error: true
         uses: snyk/actions/golang@master
         with:
-          go-version: '1.22'
+          go-version: ${{ env.GO_VERSION }}
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
       - name: Setup Release Environment

.github/workflows/ci.yml

@@ -19,26 +19,27 @@ defaults:
   run:
     shell: bash
 
+env:
+  GO_VERSION: "1.24"
+
 jobs:
   test:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
+      - uses: actions/checkout@v5
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: ${{ env.GO_VERSION }}
       - name: Run tests
         run: |
           make ci
           make check-tidy
           make check-headers
       - name: Upload coverage report
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           file: ./coverage.txt
           flags: unittests
@@ -48,15 +49,15 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: ${{ env.GO_VERSION }}
       - name: generate
         run: make generate
-      - uses: golangci/golangci-lint-action@v6.1.1
+      - uses: golangci/golangci-lint-action@v6.5.0
         with:
-          version: v1.59.0
+          version: v1.64.8
           only-new-issues: true
           skip-pkg-cache: true
           args: --timeout=3m

.github/workflows/publish-release.yml

@@ -12,5 +12,6 @@ jobs:
       - uses: mislav/bump-homebrew-formula-action@v3
         with:
           formula-name: flow-cli
+          base-branch: main
         env:
           COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}

.github/workflows/sync-labels.yml

@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - uses: micnncim/action-label-syncer@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.goreleaser.yaml

@@ -32,7 +32,7 @@ builds:
     flags:
       - -mod=readonly
     ldflags:
-      - -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 }}
+      - -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 }}
 
 archives:
   - id: golang-cross
@@ -55,4 +55,4 @@ release:
     owner: onflow
     name: flow-cli
   prerelease: auto
-  draft: false
+  draft: false

CODEOWNERS

@@ -1 +1 @@
-* @Kay-Zee @janezpodhostnik @sideninja @chasefleming @nvdtf @bluesign @bjartek @jribbink @ianthpun
+* @Kay-Zee @janezpodhostnik @chasefleming @nvdtf @bluesign @bjartek @jribbink @mfbz

CONTRIBUTING.md

@@ -205,7 +205,7 @@ equal (=) sign (ex: `--username test` or `--username=test`)
 flow accounts get --filter "address"
 ```
 
-Use common naming for default falgs such as:
+Use common naming for default flags such as:
 
 `--log`: Logging level.
 
@@ -329,7 +329,7 @@ Main help screen must contain a list of all commands with their own description,
 it must also include examples for commands. Help screen should include link to the documentation website.
 
 Commands should have a description that is not too long (less than 100 characters).
-Help should be outputed if command is ran without any arguments. Help outline should be:
+Help should be outputted if command is ran without any arguments. Help outline should be:
 
 ```Description:
     <description>

Makefile

@@ -59,7 +59,7 @@ $(BINARY):
 	GO111MODULE=on go build \
 		-trimpath \
 		-ldflags \
-		"-X github.com/onflow/flow-cli/build.semver=$(VERSION) -X github.com/onflow/flow-cli/internal/accounts.accountToken=${ACCOUNT_TOKEN}"\
+		"-X github.com/onflow/flow-cli/build.semver=$(VERSION) -X github.com/onflow/flow-cli/internal/accounts.accountToken=${ACCOUNT_TOKEN} -X github.com/onflow/flow-cli/internal/command.MixpanelToken=${MIXPANEL_PROJECT_TOKEN}" \
 		-o $(BINARY) ./cmd/flow
 
 .PHONY: versioned-binaries