Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,16 +135,6 @@ jobs:
secrets:
earthly_token: ${{ secrets.earthly_token }}

docs:
uses: input-output-hk/catalyst-forge/.github/workflows/docs.yml@master
needs: [discover, check, build, test]
if: (fromJson(needs.discover.outputs.earthfiles)['^docs(-.*)?$'] != null) && !failure() && !cancelled()
with:
earthfiles: ${{ toJson(fromJson(needs.discover.outputs.earthfiles)['^docs(-.*)?$']) }}
forge_version: ${{ inputs.forge_version }}
secrets:
earthly_token: ${{ secrets.earthly_token }}

release:
uses: input-output-hk/catalyst-forge/.github/workflows/release.yml@master
needs: [discover, check, build, test]
Expand Down
104 changes: 0 additions & 104 deletions .github/workflows/docs.yml

This file was deleted.

1 change: 1 addition & 0 deletions .github/workflows/dogfood.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ permissions:
id-token: write
contents: write
packages: write
pull-requests: write

jobs:
ci:
Expand Down
4 changes: 4 additions & 0 deletions blueprint.cue
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ global: {
registries: [
"ghcr.io/input-output-hk/catalyst-forge",
]
release: docs: {
bucket: "docs.dev.projectcatalyst.io"
url: "https://docs.dev.projectcatalyst.io/"
}
providers: {
aws: {
ecr: {
Expand Down
3 changes: 2 additions & 1 deletion cli/Earthfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION 0.8

deps:
FROM golang:1.24.0-bookworm
FROM golang:1.24.2-bookworm

WORKDIR /work

Expand All @@ -13,6 +13,7 @@
CACHE --persist --sharing shared /go

COPY ../lib/project+src/src /lib/project
COPY ../lib/providers+src/src /lib/providers
COPY ../lib/schema+src/src /lib/schema
COPY ../lib/tools+src/src /lib/tools

Expand Down Expand Up @@ -49,7 +50,7 @@
test:
FROM +build

RUN go test ./...

Check failure on line 53 in cli/Earthfile

View workflow job for this annotation

GitHub Actions / ci / test / ./cli+test

Error

The command RUN go test ./... did not complete successfully. Exit code 1

github:
FROM scratch
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/cmds/configure_satellite.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"github.com/input-output-hk/catalyst-forge/cli/pkg/earthly/satellite"
"github.com/input-output-hk/catalyst-forge/cli/pkg/run"
"github.com/input-output-hk/catalyst-forge/lib/providers/git"
"github.com/input-output-hk/catalyst-forge/lib/tools/fs/billy"
"github.com/input-output-hk/catalyst-forge/lib/tools/git"
"github.com/input-output-hk/catalyst-forge/lib/tools/walker"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/cmds/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/input-output-hk/catalyst-forge/cli/pkg/run"
"github.com/input-output-hk/catalyst-forge/cli/pkg/utils"
"github.com/input-output-hk/catalyst-forge/lib/project/secrets"
"github.com/input-output-hk/catalyst-forge/lib/providers/secrets"
sc "github.com/input-output-hk/catalyst-forge/lib/schema/blueprint/common"
"github.com/input-output-hk/catalyst-forge/lib/tools/fs"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/input-output-hk/catalyst-forge/cli/pkg/run"
"github.com/input-output-hk/catalyst-forge/lib/project/deployment"
"github.com/input-output-hk/catalyst-forge/lib/project/project"
"github.com/input-output-hk/catalyst-forge/lib/project/secrets"
"github.com/input-output-hk/catalyst-forge/lib/providers/secrets"
schema "github.com/input-output-hk/catalyst-forge/lib/schema"
"github.com/input-output-hk/catalyst-forge/lib/tools/walker"
"github.com/posener/complete"
Expand Down
48 changes: 27 additions & 21 deletions cli/go.mod
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
module github.com/input-output-hk/catalyst-forge/cli

go 1.23.0
go 1.24.2

require (
cuelang.org/go v0.12.0
github.com/alecthomas/kong v0.9.0
github.com/aws/aws-sdk-go v1.55.5
github.com/aws/aws-sdk-go-v2 v1.32.6
github.com/aws/aws-sdk-go-v2/config v1.27.40
github.com/aws/aws-sdk-go-v2/service/ecr v1.36.7
github.com/aws/aws-sdk-go-v2/service/ecr v1.46.0
github.com/aws/aws-sdk-go-v2/service/s3 v1.84.1
github.com/charmbracelet/bubbles v0.20.0
github.com/charmbracelet/bubbletea v1.1.1
github.com/charmbracelet/lipgloss v0.13.0
github.com/charmbracelet/log v0.4.0
github.com/google/go-github/v66 v66.0.0
github.com/input-output-hk/catalyst-forge/lib/project v0.0.0
github.com/input-output-hk/catalyst-forge/lib/providers v0.0.0-00010101000000-000000000000
github.com/input-output-hk/catalyst-forge/lib/schema v0.0.0
github.com/input-output-hk/catalyst-forge/lib/tools v0.0.0
github.com/migueleliasweb/go-github-mock v1.0.1
github.com/posener/complete v1.2.3
github.com/rogpeppe/go-internal v1.13.2-0.20241226121412-a5dc8ff20d0a
github.com/stretchr/testify v1.10.0
github.com/willabides/kongplete v0.4.0
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
kcl-lang.io/kpm v0.11.0
gopkg.in/yaml.v3 v3.0.1
)

require (
Expand All @@ -46,18 +44,25 @@ require (
github.com/adrg/xdg v0.5.3 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230219212500-1f9a474cc2dc // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.38 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 // indirect
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.33.4 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.23.4 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.4 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.31.4 // indirect
github.com/aws/smithy-go v1.22.1 // indirect
github.com/aws/aws-sdk-go v1.55.7 // indirect
github.com/aws/aws-sdk-go-v2 v1.36.6 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.11 // indirect
github.com/aws/aws-sdk-go-v2/config v1.29.18 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.71 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.33 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.37 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.37 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.37 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.18 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.18 // indirect
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.35.8 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.25.6 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.4 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.34.1 // indirect
github.com/aws/smithy-go v1.22.4 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
Expand Down Expand Up @@ -125,7 +130,6 @@ require (
github.com/google/btree v1.0.1 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-github/v64 v64.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/s2a-go v0.1.7 // indirect
Expand Down Expand Up @@ -242,7 +246,6 @@ require (
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
helm.sh/helm/v3 v3.17.0 // indirect
k8s.io/api v0.32.2 // indirect
k8s.io/apiextensions-apiserver v0.32.2 // indirect
Expand All @@ -256,6 +259,7 @@ require (
k8s.io/kubectl v0.32.0 // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
kcl-lang.io/kcl-go v0.11.0 // indirect
kcl-lang.io/kpm v0.11.0 // indirect
kcl-lang.io/lib v0.11.0 // indirect
oras.land/oras-go v1.2.6 // indirect
oras.land/oras-go/v2 v2.5.0 // indirect
Expand All @@ -268,6 +272,8 @@ require (

replace github.com/input-output-hk/catalyst-forge/lib/project => ../lib/project

replace github.com/input-output-hk/catalyst-forge/lib/providers => ../lib/providers

replace github.com/input-output-hk/catalyst-forge/lib/schema => ../lib/schema

replace github.com/input-output-hk/catalyst-forge/lib/tools => ../lib/tools
Loading
Loading