refactor: reorganizes repo hierarchy (#45)

.github/workflows/ci.yml

@@ -20,12 +20,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Forge
-        uses: ./forge/actions/install
+        uses: ./actions/install
         if: ${{ inputs.forge_version != 'local' }}
         with:
           version: ${{ inputs.forge_version }}
       - name: Install Local Forge
-        uses: ./forge/actions/install-local
+        uses: ./actions/install-local
         if: ${{ inputs.forge_version == 'local' }}
         with:
           earthly_token: ${{ secrets.earthly_token }}
@@ -40,12 +40,12 @@ jobs:
             echo "skip=false" >> $GITHUB_OUTPUT
           fi
       - name: Setup CI
-        uses: ./forge/actions/setup
+        uses: ./actions/setup
         with:
           skip_earthly: ${{ steps.local.outputs.skip }}
       - name: Discovery
         id: discovery
-        uses: ./forge/actions/discovery
+        uses: ./actions/discovery
         with:
           filters: |
             ^build.*

.github/workflows/publish.yml

@@ -36,12 +36,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Forge
-        uses: ./forge/actions/install
+        uses: ./actions/install
         if: ${{ inputs.forge_version != 'local' }}
         with:
           version: ${{ inputs.forge_version }}
       - name: Install Local Forge
-        uses: ./forge/actions/install-local
+        uses: ./actions/install-local
         if: ${{ inputs.forge_version == 'local' }}
         with:
           earthly_token: ${{ secrets.earthly_token }}
@@ -56,12 +56,12 @@ jobs:
             echo "skip=false" >> $GITHUB_OUTPUT
           fi
       - name: Setup CI
-        uses: ./forge/actions/setup
+        uses: ./actions/setup
         with:
           skip_earthly: ${{ steps.local.outputs.skip }}
       - name: Run
         id: run
-        uses: ./forge/actions/run
+        uses: ./actions/run
         with:
           path: ${{ matrix.earthfile }}
           target_args: --container ${{ env.CONTAINER }} --tag ${{ env.TAG }}
@@ -77,7 +77,7 @@ jobs:
           echo "project=$PROJECT" >> $GITHUB_OUTPUT
           echo "target=$TARGET" >> $GITHUB_OUTPUT
       - name: Publish
-        uses: ./forge/actions/publish
+        uses: ./actions/publish
         with:
           image: "${{ env.CONTAINER }}:${{ env.TAG }}"
           project: ${{ steps.parse.outputs.project }}

.github/workflows/release.yml

@@ -29,12 +29,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Forge
-        uses: ./forge/actions/install
+        uses: ./actions/install
         if: ${{ inputs.forge_version != 'local' }}
         with:
           version: ${{ inputs.forge_version }}
       - name: Install Local Forge
-        uses: ./forge/actions/install-local
+        uses: ./actions/install-local
         if: ${{ inputs.forge_version == 'local' }}
         with:
           earthly_token: ${{ secrets.earthly_token }}
@@ -49,12 +49,12 @@ jobs:
             echo "skip=false" >> $GITHUB_OUTPUT
           fi
       - name: Setup CI
-        uses: ./forge/actions/setup
+        uses: ./actions/setup
         with:
           skip_earthly: ${{ steps.local.outputs.skip }}
       - name: Run
         id: run
-        uses: ./forge/actions/run
+        uses: ./actions/run
         with:
           artifact: ${{ env.OUTPUT }}
           path: ${{ matrix.earthfile }}
@@ -70,7 +70,7 @@ jobs:
           echo "project=$PROJECT" >> $GITHUB_OUTPUT
           echo "target=$TARGET" >> $GITHUB_OUTPUT
       - name: Release
-        uses: ./forge/actions/release
+        uses: ./actions/release
         with:
           native_platform: linux/amd64
           path: ${{ env.OUTPUT }}

.github/workflows/run.yml

@@ -27,12 +27,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install Forge
-        uses: ./forge/actions/install
+        uses: ./actions/install
         if: ${{ inputs.forge_version != 'local' }}
         with:
           version: ${{ inputs.forge_version }}
       - name: Install Local Forge
-        uses: ./forge/actions/install-local
+        uses: ./actions/install-local
         if: ${{ inputs.forge_version == 'local' }}
         with:
           earthly_token: ${{ secrets.earthly_token }}
@@ -47,11 +47,11 @@ jobs:
             echo "skip=false" >> $GITHUB_OUTPUT
           fi
       - name: Setup CI
-        uses: ./forge/actions/setup
+        uses: ./actions/setup
         with:
           skip_earthly: ${{ steps.local.outputs.skip }}
       - name: Run
-        uses: ./forge/actions/run
+        uses: ./actions/run
         with:
           path: ${{ matrix.earthfile }}
         env:

forge/actions/run/README.md → actions/discovery/README.md

@@ -23,10 +23,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup
-        uses: input-output-hk/catalyst-forge/forge/actions/setup@master
+        uses: input-output-hk/catalyst-forge/actions/setup@master
       - name: Discover
         id: discovery
-        uses: input-output-hk/catalyst-forge/forge/actions/discover@master
+        uses: input-output-hk/catalyst-forge/actions/discover@master
         with:
           filters: |
             ^check.*

forge/actions/install-local/action.yml → actions/install-local/action.yml

@@ -23,5 +23,5 @@ runs:
       shell: bash
       run: |
         echo "::group::Forge CLI Earthly Build"
-        earthly --sat ci --artifact ./forge/cli+build/forge /usr/local/bin/forge
+        earthly --sat ci --artifact ./cli+build/forge /usr/local/bin/forge
         echo "::endgroup::"

forge/actions/install/README.md → actions/install/README.md

@@ -23,10 +23,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup
-        uses: input-output-hk/catalyst-forge/forge/actions/setup@master
+        uses: input-output-hk/catalyst-forge/actions/setup@master
       - name: Discover
         id: discovery
-        uses: input-output-hk/catalyst-forge/forge/actions/discover@master
+        uses: input-output-hk/catalyst-forge/actions/discover@master
         with:
           filters: |
             ^check.*

forge/actions/lib/package.json → actions/lib/package.json

@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "author": "",
   "private": true,
-  "homepage": "https://github.com/input-output-hk/catalyst-forge/blob/master/forge/actions/lib/README.md",
+  "homepage": "https://github.com/input-output-hk/catalyst-forge/blob/master/actions/lib/README.md",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/input-output-hk/catalyst-forge.git"

forge/actions/publish/README.md → actions/publish/README.md

@@ -19,9 +19,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup
-        uses: input-output-hk/catalyst-forge/forge/actions/setup@master
+        uses: input-output-hk/catalyst-forge/actions/setup@master
       - name: Publish
-        uses: input-output-hk/catalyst-forge/forge/actions/discover@master
+        uses: input-output-hk/catalyst-forge/actions/discover@master
         with:
           project: ./my/project/path
           container: container:tag

forge/actions/release/README.md → actions/release/README.md

@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup
-        uses: input-output-hk/catalyst-forge/forge/actions/setup@master
+        uses: input-output-hk/catalyst-forge/actions/setup@master
       - name: Release
         if: startsWith(github.ref, 'refs/tags/')
-        uses: input-output-hk/catalyst-forge/forge/actions/release@master
+        uses: input-output-hk/catalyst-forge/actions/release@master
         with:
           project: ./my/project/path
           path: ./path/to/artifacts

forge/actions/discovery/README.md → actions/run/README.md

@@ -23,10 +23,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup
-        uses: input-output-hk/catalyst-forge/forge/actions/setup@master
+        uses: input-output-hk/catalyst-forge/actions/setup@master
       - name: Discover
         id: discovery
-        uses: input-output-hk/catalyst-forge/forge/actions/discover@master
+        uses: input-output-hk/catalyst-forge/actions/discover@master
         with:
           filters: |
             ^check.*

forge/actions/setup/README.md → actions/setup/README.md

@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup
-        uses: input-output-hk/catalyst-forge/forge/actions/setup@master
+        uses: input-output-hk/catalyst-forge/actions/setup@master
 ```
 
 The action will then perform the following:

forge/cli/Earthfile → cli/Earthfile

@@ -3,7 +3,7 @@ VERSION 0.8
 deps:
     FROM golang:1.23.0-alpine3.19
 
-    WORKDIR /work/cli
+    WORKDIR /work
 
     RUN apk add git file
 
@@ -12,8 +12,8 @@ deps:
     ENV GOMODCACHE=/go/modcache
     CACHE --persist --sharing shared /go
 
-    COPY ../../blueprint+src/src /blueprint
-    COPY ../../tools+src/src /tools
+    COPY ../lib/blueprint+src/src /lib/blueprint
+    COPY ../lib/tools+src/src /lib/tools
 
     COPY go.mod go.sum .
     RUN go mod download

forge/cli/cmd/cmds/ci.go → cli/cmd/cmds/ci.go

@@ -3,7 +3,7 @@ package cmds
 import (
 	"log/slog"
 
-	"github.com/input-output-hk/catalyst-forge/forge/cli/tui/ci"
+	"github.com/input-output-hk/catalyst-forge/cli/tui/ci"
 )
 
 type CICmd struct {

forge/cli/cmd/cmds/run.go → cli/cmd/cmds/run.go

@@ -3,9 +3,9 @@ package cmds
 import (
 	"log/slog"
 
-	"github.com/input-output-hk/catalyst-forge/forge/cli/pkg/earthfile"
-	"github.com/input-output-hk/catalyst-forge/forge/cli/pkg/executor"
-	"github.com/input-output-hk/catalyst-forge/forge/cli/pkg/secrets"
+	"github.com/input-output-hk/catalyst-forge/cli/pkg/earthfile"
+	"github.com/input-output-hk/catalyst-forge/cli/pkg/executor"
+	"github.com/input-output-hk/catalyst-forge/cli/pkg/secrets"
 )
 
 type RunCmd struct {

forge/cli/cmd/cmds/scan.go → cli/cmd/cmds/scan.go

@@ -8,9 +8,9 @@ import (
 	"sort"
 
 	"cuelang.org/go/cue"
-	"github.com/input-output-hk/catalyst-forge/forge/cli/pkg/project"
-	"github.com/input-output-hk/catalyst-forge/forge/cli/pkg/scan"
-	"github.com/input-output-hk/catalyst-forge/tools/pkg/walker"
+	"github.com/input-output-hk/catalyst-forge/cli/pkg/project"
+	"github.com/input-output-hk/catalyst-forge/cli/pkg/scan"
+	"github.com/input-output-hk/catalyst-forge/lib/tools/pkg/walker"
 	"golang.org/x/exp/maps"
 )
 

forge/cli/cmd/cmds/secret.go → cli/cmd/cmds/secret.go

@@ -6,8 +6,8 @@ import (
 	"log/slog"
 	"strings"
 
-	"github.com/input-output-hk/catalyst-forge/blueprint/schema"
-	"github.com/input-output-hk/catalyst-forge/forge/cli/pkg/secrets"
+	"github.com/input-output-hk/catalyst-forge/cli/pkg/secrets"
+	"github.com/input-output-hk/catalyst-forge/lib/blueprint/schema"
 )
 
 const (

forge/cli/cmd/cmds/tag.go → cli/cmd/cmds/tag.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log/slog"
 
-	p "github.com/input-output-hk/catalyst-forge/forge/cli/pkg/project"
+	p "github.com/input-output-hk/catalyst-forge/cli/pkg/project"
 )
 
 type TagCmd struct {

forge/cli/cmd/cmds/util.go → cli/cmd/cmds/util.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log/slog"
 
-	"github.com/input-output-hk/catalyst-forge/forge/cli/pkg/earthly"
-	"github.com/input-output-hk/catalyst-forge/forge/cli/pkg/project"
+	"github.com/input-output-hk/catalyst-forge/cli/pkg/earthly"
+	"github.com/input-output-hk/catalyst-forge/cli/pkg/project"
 )
 
 type GlobalArgs struct {

forge/cli/cmd/main.go → cli/cmd/main.go

@@ -9,8 +9,8 @@ import (
 	"cuelang.org/go/cue/cuecontext"
 	"github.com/alecthomas/kong"
 	"github.com/charmbracelet/log"
-	"github.com/input-output-hk/catalyst-forge/blueprint/schema"
-	"github.com/input-output-hk/catalyst-forge/forge/cli/cmd/cmds"
+	"github.com/input-output-hk/catalyst-forge/cli/cmd/cmds"
+	"github.com/input-output-hk/catalyst-forge/lib/blueprint/schema"
 )
 
 var version = "dev"

forge/cli/go.mod → cli/go.mod

@@ -1,4 +1,4 @@
-module github.com/input-output-hk/catalyst-forge/forge/cli
+module github.com/input-output-hk/catalyst-forge/cli
 
 go 1.22.3
 
@@ -14,8 +14,8 @@ require (
 	github.com/charmbracelet/log v0.4.0
 	github.com/earthly/earthly/ast v0.0.2-0.20240228223838-42e8ca204e8a
 	github.com/go-git/go-git/v5 v5.12.0
-	github.com/input-output-hk/catalyst-forge/blueprint v0.0.0
-	github.com/input-output-hk/catalyst-forge/tools v0.0.0
+	github.com/input-output-hk/catalyst-forge/lib/blueprint v0.0.0
+	github.com/input-output-hk/catalyst-forge/lib/tools v0.0.0
 	github.com/rogpeppe/go-internal v1.12.1-0.20240709150035-ccf4b4329d21
 	github.com/spf13/afero v1.11.0
 	github.com/stretchr/testify v1.9.0
@@ -82,6 +82,6 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/input-output-hk/catalyst-forge/blueprint => ../../blueprint
+replace github.com/input-output-hk/catalyst-forge/lib/blueprint => ../lib/blueprint
 
-replace github.com/input-output-hk/catalyst-forge/tools => ../../tools
+replace github.com/input-output-hk/catalyst-forge/lib/tools => ../lib/tools

forge/cli/pkg/earthfile/earthfile.go → cli/pkg/earthfile/earthfile.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/earthly/earthly/ast"
 	"github.com/earthly/earthly/ast/spec"
-	"github.com/input-output-hk/catalyst-forge/tools/pkg/walker"
+	"github.com/input-output-hk/catalyst-forge/lib/tools/pkg/walker"
 )
 
 // Earthfile represents a parsed Earthfile.

forge/cli/pkg/earthfile/earthfile_test.go → cli/pkg/earthfile/earthfile_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/earthly/earthly/ast/spec"
-	"github.com/input-output-hk/catalyst-forge/tools/pkg/testutils"
+	"github.com/input-output-hk/catalyst-forge/lib/tools/pkg/testutils"
 	"github.com/stretchr/testify/assert"
 )
 

forge/cli/pkg/earthly/earthly.go → cli/pkg/earthly/earthly.go

@@ -11,9 +11,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/input-output-hk/catalyst-forge/blueprint/schema"
-	"github.com/input-output-hk/catalyst-forge/forge/cli/pkg/executor"
-	secretstore "github.com/input-output-hk/catalyst-forge/forge/cli/pkg/secrets"
+	"github.com/input-output-hk/catalyst-forge/cli/pkg/executor"
+	secretstore "github.com/input-output-hk/catalyst-forge/cli/pkg/secrets"
+	"github.com/input-output-hk/catalyst-forge/lib/blueprint/schema"
 )
 
 // EarthlyExecutorOption is an option for configuring an EarthlyExecutor.

forge/cli/pkg/earthly/earthly_test.go → cli/pkg/earthly/earthly_test.go

@@ -5,12 +5,12 @@ import (
 	"log/slog"
 	"testing"
 
-	"github.com/input-output-hk/catalyst-forge/blueprint/pkg/utils"
-	"github.com/input-output-hk/catalyst-forge/blueprint/schema"
-	emocks "github.com/input-output-hk/catalyst-forge/forge/cli/pkg/executor/mocks"
-	"github.com/input-output-hk/catalyst-forge/forge/cli/pkg/secrets"
-	smocks "github.com/input-output-hk/catalyst-forge/forge/cli/pkg/secrets/mocks"
-	"github.com/input-output-hk/catalyst-forge/tools/pkg/testutils"
+	emocks "github.com/input-output-hk/catalyst-forge/cli/pkg/executor/mocks"
+	"github.com/input-output-hk/catalyst-forge/cli/pkg/secrets"
+	smocks "github.com/input-output-hk/catalyst-forge/cli/pkg/secrets/mocks"
+	"github.com/input-output-hk/catalyst-forge/lib/blueprint/pkg/utils"
+	"github.com/input-output-hk/catalyst-forge/lib/blueprint/schema"
+	"github.com/input-output-hk/catalyst-forge/lib/tools/pkg/testutils"
 	"github.com/stretchr/testify/assert"
 )