Merge pull request #353 from dan-r/patch-1

Migrate firefly dependencies and container images to new org

Author: EnriqueL8

.github/workflows/build.yml

@@ -20,6 +20,6 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.22"
+          go-version: "1.26.4"
       - name: Compile FireFly CLI
         run: make

.github/workflows/e2e.yml

@@ -85,13 +85,13 @@ jobs:
       - name: Checkout FireFly Core repo
         uses: actions/checkout@v4
         with:
-          repository: hyperledger/firefly
+          repository: hyperledger-firefly/firefly
           path: firefly
 
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.22"
+          go-version: "1.26.4"
 
       - name: Compile FireFly CLI
         working-directory: firefly-cli

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.22"
+          go-version: "1.26.4"
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v4
         with:

.goreleaser.yml

@@ -26,7 +26,7 @@ builds:
     main: ./ff
     binary: ff
     ldflags:
-      - "-s -w -X 'github.com/hyperledger/firefly-cli/cmd.BuildVersionOverride={{.Version}}' -X 'github.com/hyperledger/firefly-cli/cmd.BuildDate={{.Date}}' -X 'github.com/hyperledger/firefly-cli/cmd.BuildCommit={{.Commit}}'"
+      - "-s -w -X 'github.com/hyperledger-firefly/cli/cmd.BuildVersionOverride={{.Version}}' -X 'github.com/hyperledger-firefly/cli/cmd.BuildDate={{.Date}}' -X 'github.com/hyperledger-firefly/cli/cmd.BuildCommit={{.Commit}}'"
 archives:
   - name_template: >-
       {{ .ProjectName }}_{{ .Version }}_

CONTRIBUTING.md

@@ -4,7 +4,7 @@ We welcome contributions to the FireFly Project in many forms, and
 there's always plenty to do!
 
 Please visit the
-[contributors guide](https://hyperledger.github.io/firefly/latest/contributors/index) in the
+[contributors guide](https://hyperledger-firefly.github.io/firefly/latest/contributors/index) in the
 docs to learn how to make contributions to this exciting project.
 
 <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.

Makefile

@@ -26,9 +26,9 @@ format: ## Formats all go code
 test: deps
 		$(VGO) test ./internal/... ./pkg/... ./cmd/... -cover -coverprofile=coverage.txt -covermode=atomic -timeout=30s ${TEST_ARGS}
 build: ## Builds all go code
-		cd ff && go build -ldflags="-X 'github.com/hyperledger/firefly-cli/cmd.BuildDate=$(DATE)' -X 'github.com/hyperledger/firefly-cli/cmd.BuildCommit=$(GITREF)'"
+		cd ff && go build -ldflags="-X 'github.com/hyperledger-firefly/cli/cmd.BuildDate=$(DATE)' -X 'github.com/hyperledger-firefly/cli/cmd.BuildCommit=$(GITREF)'"
 install: ## Installs the package
-		cd ff && go install -ldflags="-X 'github.com/hyperledger/firefly-cli/cmd.BuildDate=$(DATE)' -X 'github.com/hyperledger/firefly-cli/cmd.BuildCommit=$(GITREF)'"
+		cd ff && go install -ldflags="-X 'github.com/hyperledger-firefly/cli/cmd.BuildDate=$(DATE)' -X 'github.com/hyperledger-firefly/cli/cmd.BuildCommit=$(GITREF)'"
 
 lint: ${LINT} ## Checks and reports lint errors
 		GOGC=20 $(LINT) run -v --timeout 5m

README.md

@@ -1,8 +1,8 @@
 # FireFly CLI
 
-![build](https://github.com/hyperledger/firefly-cli/actions/workflows/build.yml/badge.svg?branch=main)
+![build](https://github.com/hyperledger-firefly/cli/actions/workflows/build.yml/badge.svg?branch=main)
 
-The FireFly CLI can be used to create local [FireFly](https://github.com/hyperledger/firefly) stacks
+The FireFly CLI can be used to create local [FireFly](https://github.com/hyperledger-firefly/firefly) stacks
 for offline development of blockchain apps. This allows developers to rapidly iterate on their idea without
 needing to set up a bunch of infrastructure before they can write the first line of code.
 
@@ -21,7 +21,7 @@ In order to run the FireFly CLI, you will need a few things installed on your de
 The easiest way to get up and running with the FireFly CLI is to download a pre-compiled binary of the latest release.
 
 ### Download the package for your OS
-Go to the [latest release page](https://github.com/hyperledger/firefly-cli/releases/latest) and download the package for your OS and CPU architecture.
+Go to the [latest release page](https://github.com/hyperledger-firefly/cli/releases/latest) and download the package for your OS and CPU architecture.
 
 ### Extract the binary and move it to `/usr/local/bin`
 
@@ -47,7 +47,7 @@ If you downloaded the package from GitHub into a different directory, you will n
 If you have a local Go development environment, and you have included `${GOPATH}/bin` in your path, you can install with:
 
 ```sh
-go install github.com/hyperledger/firefly-cli/ff@latest
+go install github.com/hyperledger-firefly/cli/ff@latest
 ```
 
 ## Create a new stack

cmd/accounts_create.go

@@ -20,9 +20,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hyperledger/firefly-cli/internal/docker"
-	"github.com/hyperledger/firefly-cli/internal/log"
-	"github.com/hyperledger/firefly-cli/internal/stacks"
+	"github.com/hyperledger-firefly/cli/internal/docker"
+	"github.com/hyperledger-firefly/cli/internal/log"
+	"github.com/hyperledger-firefly/cli/internal/stacks"
 	"github.com/spf13/cobra"
 )
 

cmd/accounts_create_test.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hyperledger/firefly-cli/internal/utils"
+	"github.com/hyperledger-firefly/cli/internal/utils"
 	"github.com/stretchr/testify/assert"
 )
 

cmd/accounts_list.go

@@ -21,9 +21,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/hyperledger/firefly-cli/internal/docker"
-	"github.com/hyperledger/firefly-cli/internal/log"
-	"github.com/hyperledger/firefly-cli/internal/stacks"
+	"github.com/hyperledger-firefly/cli/internal/docker"
+	"github.com/hyperledger-firefly/cli/internal/log"
+	"github.com/hyperledger-firefly/cli/internal/stacks"
 	"github.com/spf13/cobra"
 )