fix: CI tools

actions/setup/action.yml

@@ -73,77 +73,77 @@ inputs:
 runs:
   using: composite
   steps:
-    # Login to Docker Hub first as it increases our API rate limit
-    - name: Login to Docker Hub
-      uses: docker/login-action@v3
-      if: ${{ inputs.dockerhub_username != '' && inputs.dockerhub_token != '' }}
-      with:
-        username: ${{ inputs.dockerhub_username }}
-        password: ${{ inputs.dockerhub_token }}
-    - name: Install Earthly
-      uses: earthly/actions-setup@v1
-      if: ${{ inputs.earthly_skip_install == 'false' }}
-      with:
-        version: ${{ inputs.earthly_version }}
-    - name: Install CI CLI
-      uses: input-output-hk/catalyst-ci/actions/install@master
-      if: ${{ inputs.cli_skip_install == 'false' && inputs.cli_version != 'local' }}
-      with:
-        version: ${{ inputs.updater_version }}
-    - name: Install updater CLI
-      uses: input-output-hk/catalyst-ci/actions/install@master
-      if: ${{ inputs.updater_skip_install == 'false' && inputs.updater_version != 'local' }}
-      with:
-        asset: updater
-        version: ${{ inputs.updater_version }}
-    - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v4
-      if: ${{ inputs.aws_region != '' && inputs.aws_role_arn != '' }}
-      with:
-        role-to-assume: ${{ inputs.aws_role_arn }}
-        aws-region: ${{ inputs.aws_region }}
-    - name: Login to ECR
-      uses: docker/login-action@v3
-      if: ${{ inputs.aws_role_arn != '' && inputs.aws_ecr_registry != '' && inputs.configure_registries == 'true' }}
-      with:
-        registry: ${{ inputs.aws_ecr_registry }}
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v3
-      if: ${{ inputs.configure_registries == 'true' }}
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ inputs.github_token }}
-    - name: Setup Remote Runner
-      uses: input-output-hk/catalyst-ci/actions/configure-runner@master
-      if: ${{ inputs.earthly_runner_secret != '' && inputs.earthly_skip_install != 'true' }}
-      with:
-        secret: ${{ inputs.earthly_runner_secret }}
-    - name: Build CI CLI
-      id: build-ci-artifact
-      uses: input-output-hk/catalyst-ci/actions/run@master
-      if: ${{ inputs.cli_skip_install == 'false' && inputs.cli_version == 'local' }}
-      with:
-        artifact: "true"
-        artifact_path: "tmp"
-        earthfile: ./cli
-        targets: release
-        runner_address: ${{ inputs.runner_address }}
-    - name: Move CI CLI
-      shell: bash
-      if: ${{ inputs.cli_skip_install == 'false' && inputs.cli_version == 'local' }}
-      run: mv '${{ steps.build-ci-artifact.outputs.artifact }}/ci' /usr/local/bin
-    - name: Build updater CLI
-      id: build-updater-artifact
-      uses: input-output-hk/catalyst-ci/actions/run@master
-      if: ${{ inputs.updater_skip_install == 'false' && inputs.updater_version == 'local' }}
-      with:
-        artifact: "true"
-        artifact_path: "tmp"
-        earthfile: ./tools/updater
-        targets: release
-        runner_address: ${{ inputs.runner_address }}
-    - name: Move updater CLI
-      shell: bash
-      if: ${{ inputs.updater_skip_install == 'false' && inputs.updater_version == 'local' }}
-      run: mv '${{ steps.build-updater-artifact.outputs.artifact }}/updater' /usr/local/bin
+  # Login to Docker Hub first as it increases our API rate limit
+  - name: Login to Docker Hub
+    uses: docker/login-action@v3
+    if: ${{ inputs.dockerhub_username != '' && inputs.dockerhub_token != '' }}
+    with:
+      username: ${{ inputs.dockerhub_username }}
+      password: ${{ inputs.dockerhub_token }}
+  - name: Install Earthly
+    uses: earthly/actions-setup@v1
+    if: ${{ inputs.earthly_skip_install == 'false' }}
+    with:
+      version: ${{ inputs.earthly_version }}
+  - name: Install CI CLI
+    uses: input-output-hk/catalyst-ci/actions/install@master
+    if: ${{ inputs.cli_skip_install == 'false' && inputs.cli_version != 'local' }}
+    with:
+      version: ${{ inputs.updater_version }}
+  - name: Install updater CLI
+    uses: input-output-hk/catalyst-ci/actions/install@master
+    if: ${{ inputs.updater_skip_install == 'false' && inputs.updater_version != 'local' }}
+    with:
+      asset: updater
+      version: ${{ inputs.updater_version }}
+  - name: Configure AWS Credentials
+    uses: aws-actions/configure-aws-credentials@v4
+    if: ${{ inputs.aws_region != '' && inputs.aws_role_arn != '' }}
+    with:
+      role-to-assume: ${{ inputs.aws_role_arn }}
+      aws-region: ${{ inputs.aws_region }}
+  - name: Login to ECR
+    uses: docker/login-action@v3
+    if: ${{ inputs.aws_role_arn != '' && inputs.aws_ecr_registry != '' && inputs.configure_registries == 'true' }}
+    with:
+      registry: ${{ inputs.aws_ecr_registry }}
+  - name: Login to GitHub Container Registry
+    uses: docker/login-action@v3
+    if: ${{ inputs.configure_registries == 'true' }}
+    with:
+      registry: ghcr.io
+      username: ${{ github.actor }}
+      password: ${{ inputs.github_token }}
+  - name: Setup Remote Runner
+    uses: input-output-hk/catalyst-ci/actions/configure-runner@master
+    if: ${{ inputs.earthly_runner_secret != '' && inputs.earthly_skip_install != 'true' }}
+    with:
+      secret: ${{ inputs.earthly_runner_secret }}
+  - name: Build CI CLI
+    id: build-ci-artifact
+    uses: input-output-hk/catalyst-ci/actions/run@master
+    if: ${{ inputs.cli_skip_install == 'false' && inputs.cli_version == 'local' }}
+    with:
+      artifact: "true"
+      artifact_path: "tmp"
+      earthfile: ./cli
+      targets: release
+      runner_address: ${{ inputs.runner_address }}
+  - name: Move CI CLI
+    shell: bash
+    if: ${{ inputs.cli_skip_install == 'false' && inputs.cli_version == 'local' }}
+    run: mv '${{ steps.build-ci-artifact.outputs.artifact }}/ci' /usr/local/bin
+  - name: Build updater CLI
+    id: build-updater-artifact
+    uses: input-output-hk/catalyst-ci/actions/run@master
+    if: ${{ inputs.updater_skip_install == 'false' && inputs.updater_version == 'local' }}
+    with:
+      artifact: "true"
+      artifact_path: "tmp"
+      earthfile: ./tools/updater
+      targets: release
+      runner_address: ${{ inputs.runner_address }}
+  - name: Move updater CLI
+    shell: bash
+    if: ${{ inputs.updater_skip_install == 'false' && inputs.updater_version == 'local' }}
+    run: mv '${{ steps.build-updater-artifact.outputs.artifact }}/updater' /usr/local/bin

cli/go.mod

@@ -1,12 +1,14 @@
 module github.com/input-output-hk/catalyst-ci/cli
 
-go 1.19
+go 1.21
+
+toolchain go1.22.2
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/alecthomas/kong v0.7.1
 	github.com/aws/aws-sdk-go v1.44.274
-	github.com/earthly/earthly/ast v0.0.2-0.20231213200555-95fef7ce99cb
+	github.com/earthly/earthly/ast v0.0.2-0.20240228223838-42e8ca204e8a
 	github.com/onsi/ginkgo/v2 v2.9.7
 	github.com/onsi/gomega v1.27.7
 	github.com/spf13/afero v1.9.5

cli/go.sum

@@ -36,15 +36,16 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-git.sr.ht/~nelsam/hel v0.4.4 h1:Cg3aOqeJ7nDg+pCR+ue8OsXDst+UVNlm3vmbCc9ToNQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
 github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
 github.com/alecthomas/assert/v2 v2.1.0 h1:tbredtNcQnoSd3QBhQWI7QZ3XHOVkw1Moklp2ojoH/0=
+github.com/alecthomas/assert/v2 v2.1.0/go.mod h1:b/+1DI2Q6NckYi+3mXyH3wFb8qG37K/DuK80n7WefXA=
 github.com/alecthomas/kong v0.7.1 h1:azoTh0IOfwlAX3qN9sHWTxACE2oV8Bg2gAwBsMwDQY4=
 github.com/alecthomas/kong v0.7.1/go.mod h1:n1iCIO2xS46oE8ZfYCNDqdR0b0wZNrXAIAqro/2132U=
 github.com/alecthomas/repr v0.1.0 h1:ENn2e1+J3k09gyj2shc0dHr/yjaWSHRlrJ4DPMevDqE=
+github.com/alecthomas/repr v0.1.0/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
 github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230219212500-1f9a474cc2dc h1:ikxgKfnYm4kXCOohe1uCkVFwZcABDZbVsqginko+GY8=
 github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230219212500-1f9a474cc2dc/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM=
 github.com/aws/aws-sdk-go v1.44.274 h1:vfreSv19e/9Ka9YytOzgzJasrRZfX7dnttLlbh8NKeA=
@@ -61,8 +62,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/earthly/earthly/ast v0.0.2-0.20231213200555-95fef7ce99cb h1:dP0Wcrfbq5whzPCT/ZHGTvWVvx7S6BoF32nRHqhKt7E=
-github.com/earthly/earthly/ast v0.0.2-0.20231213200555-95fef7ce99cb/go.mod h1:UX9246125xgKvMIKim7WTxR8nookovxWx8/Ze8kpYlQ=
+github.com/earthly/earthly/ast v0.0.2-0.20240228223838-42e8ca204e8a h1:Z4oatniIQ8EG0JL26cX9cc7IeJUe9Zs7wFetMJpbEhY=
+github.com/earthly/earthly/ast v0.0.2-0.20240228223838-42e8ca204e8a/go.mod h1:74/Fa5yMVQdnD/a32pXf8CrzH6MfAaXNIFt15MoHuv0=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -102,6 +103,7 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -138,6 +140,7 @@ github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
+github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
@@ -164,7 +167,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/poy/onpar v0.3.2 h1:yo8ZRqU3C4RlvkXPWUWfonQiTodAgpKQZ1g8VTNU9xU=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
@@ -173,8 +175,9 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -231,6 +234,7 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -487,6 +491,7 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

earthly/mithril_snapshot/Earthfile

@@ -1,4 +1,4 @@
-VERSION 0.7
+VERSION 0.8
 
 # cspell: words preprod