Skip to content

Commit f23edff

Browse files
jmgilmanjmgilman
authored
refactor(cli): removes dependency on KCL CLI (#123)
1 parent ed2eaaf commit f23edff

File tree

18 files changed

+1548
-182
lines changed

18 files changed

+1548
-182
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ jobs:
4747
steps:
4848
- uses: actions/checkout@v4
4949
- name: Install Forge
50-
uses: input-output-hk/catalyst-forge/actions/install@master
50+
uses: input-output-hk/catalyst-forge/actions/install@remove-kcl-dep
5151
if: ${{ inputs.forge_version != 'local' }}
5252
with:
5353
version: ${{ inputs.forge_version }}
5454
- name: Install Local Forge
55-
uses: input-output-hk/catalyst-forge/actions/install-local@master
55+
uses: input-output-hk/catalyst-forge/actions/install-local@remove-kcl-dep
5656
if: ${{ inputs.forge_version == 'local' }}
5757
with:
5858
earthly_token: ${{ secrets.earthly_token }}
@@ -67,14 +67,14 @@ jobs:
6767
echo "skip=false" >> $GITHUB_OUTPUT
6868
fi
6969
- name: Setup CI
70-
uses: input-output-hk/catalyst-forge/actions/setup@master
70+
uses: input-output-hk/catalyst-forge/actions/setup@remove-kcl-dep
7171
with:
7272
skip_docker: 'true'
7373
skip_github: 'true'
7474
skip_earthly: ${{ steps.local.outputs.skip }}
7575
- name: Discovery
7676
id: discovery
77-
uses: input-output-hk/catalyst-forge/actions/discovery@master
77+
uses: input-output-hk/catalyst-forge/actions/discovery@remove-kcl-dep
7878
with:
7979
filters: |
8080
${{ env.FORGE_REGEX_CHECK }}
@@ -86,7 +86,7 @@ jobs:
8686
${{ env.FORGE_REGEX_PUBLISH }}
8787
${{ env.FORGE_REGEX_NIGHTLY }}
8888
check:
89-
uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master
89+
uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@remove-kcl-dep
9090
needs: [discover]
9191
if: (fromJson(needs.discover.outputs.earthfiles)['^check(-.*)?$'] != null) && !failure() && !cancelled()
9292
with:
@@ -98,7 +98,7 @@ jobs:
9898
earthly_token: ${{ secrets.earthly_token }}
9999

100100
build:
101-
uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master
101+
uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@remove-kcl-dep
102102
needs: [discover, check]
103103
if: (fromJson(needs.discover.outputs.earthfiles)['^build(-.*)?$'] != null) && !failure() && !cancelled()
104104
with:
@@ -110,7 +110,7 @@ jobs:
110110
earthly_token: ${{ secrets.earthly_token }}
111111

112112
package:
113-
uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master
113+
uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@remove-kcl-dep
114114
needs: [discover, check, build]
115115
if: (fromJson(needs.discover.outputs.earthfiles)['^package(-.*)?$'] != null) && !failure() && !cancelled()
116116
with:
@@ -122,7 +122,7 @@ jobs:
122122
earthly_token: ${{ secrets.earthly_token }}
123123

124124
test:
125-
uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master
125+
uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@remove-kcl-dep
126126
needs: [discover, check, build, package]
127127
if: (fromJson(needs.discover.outputs.earthfiles)['^test(-.*)?$'] != null) && !failure() && !cancelled()
128128
with:
@@ -134,7 +134,7 @@ jobs:
134134
earthly_token: ${{ secrets.earthly_token }}
135135

136136
nightly:
137-
uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@master
137+
uses: input-output-hk/catalyst-forge/.github/workflows/run.yml@remove-kcl-dep
138138
needs: [discover, check, build, package]
139139
if: (fromJson(needs.discover.outputs.earthfiles)['^nightly(-.*)?$'] != null) && !failure() && !cancelled() && inputs.nightly == true
140140
with:
@@ -146,7 +146,7 @@ jobs:
146146
earthly_token: ${{ secrets.earthly_token }}
147147

148148
docs:
149-
uses: input-output-hk/catalyst-forge/.github/workflows/docs.yml@master
149+
uses: input-output-hk/catalyst-forge/.github/workflows/docs.yml@remove-kcl-dep
150150
needs: [discover, check, build, test]
151151
if: (fromJson(needs.discover.outputs.earthfiles)['^docs(-.*)?$'] != null) && !failure() && !cancelled()
152152
with:
@@ -156,7 +156,7 @@ jobs:
156156
earthly_token: ${{ secrets.earthly_token }}
157157

158158
release:
159-
uses: input-output-hk/catalyst-forge/.github/workflows/release.yml@master
159+
uses: input-output-hk/catalyst-forge/.github/workflows/release.yml@remove-kcl-dep
160160
needs: [discover, check, build, test]
161161
if: (fromJson(needs.discover.outputs.releases)[0] != null) && !failure() && !cancelled()
162162
with:
@@ -168,7 +168,7 @@ jobs:
168168
earthly_token: ${{ secrets.earthly_token }}
169169

170170
deploy:
171-
uses: input-output-hk/catalyst-forge/.github/workflows/deploy.yml@master
171+
uses: input-output-hk/catalyst-forge/.github/workflows/deploy.yml@remove-kcl-dep
172172
needs: [discover, check, build, test, release]
173173
if: (fromJson(needs.discover.outputs.deployments)[0] != null) && !failure() && !cancelled()
174174
with:

‎.github/workflows/deploy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ jobs:
4141
steps:
4242
- uses: actions/checkout@v4
4343
- name: Install Forge
44-
uses: input-output-hk/catalyst-forge/actions/install@master
44+
uses: input-output-hk/catalyst-forge/actions/install@remove-kcl-dep
4545
if: ${{ inputs.forge_version != 'local' }}
4646
with:
4747
version: ${{ inputs.forge_version }}
4848
- name: Install Local Forge
49-
uses: input-output-hk/catalyst-forge/actions/install-local@master
49+
uses: input-output-hk/catalyst-forge/actions/install-local@remove-kcl-dep
5050
if: ${{ inputs.forge_version == 'local' }}
5151
with:
5252
earthly_token: ${{ secrets.earthly_token }}
@@ -61,11 +61,11 @@ jobs:
6161
echo "skip=false" >> $GITHUB_OUTPUT
6262
fi
6363
- name: Setup CI
64-
uses: input-output-hk/catalyst-forge/actions/setup@master
64+
uses: input-output-hk/catalyst-forge/actions/setup@remove-kcl-dep
6565
with:
6666
skip_earthly: ${{ steps.local.outputs.skip }}
6767
- name: Deploy
68-
uses: input-output-hk/catalyst-forge/actions/run@master
68+
uses: input-output-hk/catalyst-forge/actions/run@remove-kcl-dep
6969
with:
7070
command: deploy push
7171
args: ${{ matrix.deployment }}

‎.github/workflows/docs.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ jobs:
4444
steps:
4545
- uses: actions/checkout@v4
4646
- name: Install Forge
47-
uses: input-output-hk/catalyst-forge/actions/install@master
47+
uses: input-output-hk/catalyst-forge/actions/install@remove-kcl-dep
4848
if: ${{ inputs.forge_version != 'local' }}
4949
with:
5050
version: ${{ inputs.forge_version }}
5151
- name: Install Local Forge
52-
uses: input-output-hk/catalyst-forge/actions/install-local@master
52+
uses: input-output-hk/catalyst-forge/actions/install-local@remove-kcl-dep
5353
if: ${{ inputs.forge_version == 'local' }}
5454
with:
5555
earthly_token: ${{ secrets.earthly_token }}
@@ -64,11 +64,11 @@ jobs:
6464
echo "skip=false" >> $GITHUB_OUTPUT
6565
fi
6666
- name: Setup CI
67-
uses: input-output-hk/catalyst-forge/actions/setup@master
67+
uses: input-output-hk/catalyst-forge/actions/setup@remove-kcl-dep
6868
with:
6969
skip_earthly: ${{ steps.local.outputs.skip }}
7070
- name: Run
71-
uses: input-output-hk/catalyst-forge/actions/run@master
71+
uses: input-output-hk/catalyst-forge/actions/run@remove-kcl-dep
7272
with:
7373
command: run
7474
args: --artifact ${{ env.OUTPUT }} ${{ matrix.earthfile }}

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ jobs:
4545
steps:
4646
- uses: actions/checkout@v4
4747
- name: Install Forge
48-
uses: input-output-hk/catalyst-forge/actions/install@master
48+
uses: input-output-hk/catalyst-forge/actions/install@remove-kcl-dep
4949
if: ${{ inputs.forge_version != 'local' }}
5050
with:
5151
version: ${{ inputs.forge_version }}
5252
- name: Install Local Forge
53-
uses: input-output-hk/catalyst-forge/actions/install-local@master
53+
uses: input-output-hk/catalyst-forge/actions/install-local@remove-kcl-dep
5454
if: ${{ inputs.forge_version == 'local' }}
5555
with:
5656
earthly_token: ${{ secrets.earthly_token }}
@@ -65,11 +65,11 @@ jobs:
6565
echo "skip=false" >> $GITHUB_OUTPUT
6666
fi
6767
- name: Setup CI
68-
uses: input-output-hk/catalyst-forge/actions/setup@master
68+
uses: input-output-hk/catalyst-forge/actions/setup@remove-kcl-dep
6969
with:
7070
skip_earthly: ${{ steps.local.outputs.skip }}
7171
- name: Release
72-
uses: input-output-hk/catalyst-forge/actions/run@master
72+
uses: input-output-hk/catalyst-forge/actions/run@remove-kcl-dep
7373
with:
7474
command: release
7575
args: ${{ matrix.release.project }} ${{ matrix.release.name }}

‎.github/workflows/run.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@v4
4444
- name: Install Forge
45-
uses: input-output-hk/catalyst-forge/actions/install@master
45+
uses: input-output-hk/catalyst-forge/actions/install@remove-kcl-dep
4646
if: ${{ inputs.forge_version != 'local' }}
4747
with:
4848
version: ${{ inputs.forge_version }}
4949
- name: Install Local Forge
50-
uses: input-output-hk/catalyst-forge/actions/install-local@master
50+
uses: input-output-hk/catalyst-forge/actions/install-local@remove-kcl-dep
5151
if: ${{ inputs.forge_version == 'local' }}
5252
with:
5353
earthly_token: ${{ secrets.earthly_token }}
@@ -62,11 +62,11 @@ jobs:
6262
echo "skip=false" >> $GITHUB_OUTPUT
6363
fi
6464
- name: Setup CI
65-
uses: input-output-hk/catalyst-forge/actions/setup@master
65+
uses: input-output-hk/catalyst-forge/actions/setup@remove-kcl-dep
6666
with:
6767
skip_earthly: ${{ steps.local.outputs.skip }}
6868
- name: Run
69-
uses: input-output-hk/catalyst-forge/actions/run@master
69+
uses: input-output-hk/catalyst-forge/actions/run@remove-kcl-dep
7070
with:
7171
command: run
7272
args: ${{ matrix.earthfile }}

‎actions/setup/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ runs:
257257
path: /usr/local/bin/kcl
258258
key: ${{ runner.os }}-kcl-${{ steps.kcl.outputs.version }}
259259
- name: Install KCL
260-
if: steps.cache-kcl.outputs.cache-hit == false
260+
if: steps.kcl.outputs.install && steps.cache-kcl.outputs.cache-hit == false
261261
shell: bash
262262
run: |
263263
WORKDIR="$(mktemp -d)"

‎blueprint.cue‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@ global: {
5555
}
5656
registry: "ghcr.io"
5757
}
58-
59-
kcl: {
60-
install: true
61-
version: "v0.11.0"
62-
}
6358
}
6459
secrets: [
6560
{

‎cli/Earthfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
VERSION 0.8
22

33
deps:
4-
FROM golang:1.23.0-alpine3.19
4+
FROM golang:1.23.0-bookworm
55

66
WORKDIR /work
77

8-
RUN apk add git file
8+
RUN apt-get update && apt-get install -y file
99

1010
RUN mkdir -p /go/cache && mkdir -p /go/modcache
1111
ENV GOCACHE=/go/cache

0 commit comments

Comments
 (0)