Merge pull request #362 from onflow/auto-update-onflow-cadence-v1.0.0…

…-preview.25
onflow · May 2, 2024 · 0edeb6e · 0edeb6e
2 parents 2c35f7d + 190ca7c
commit 0edeb6e
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 169 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,13 +4,13 @@ on:
   push:
     branches:
       - master
-      - "feature/**"
-      - "v**"
+      - 'feature/**'
+      - 'v**'
   pull_request:
     branches:
       - master
-      - "feature/**"
-      - "v**"
+      - 'feature/**'
+      - 'v**'
 
 jobs:
   paths-filter:
@@ -21,42 +21,42 @@ jobs:
       languageserver: ${{ steps.filter.outputs.languageserver }}
       docgen: ${{ steps.filter.outputs.docgen }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: dorny/paths-filter@v2
-        id: filter
-        with:
-          filters: |
-            test:
-              - 'test/**'
-            lint:
-              - 'lint/**'
-            languageserver:
-              - 'languageserver/**'
-            docgen:
-              - 'docgen/**'
+    - uses: actions/checkout@v3
+    - uses: dorny/paths-filter@v2
+      id: filter
+      with:
+        filters: |
+          test:
+            - 'test/**'
+          lint:
+            - 'lint/**'
+          languageserver:
+            - 'languageserver/**'
+          docgen:
+            - 'docgen/**'
 
   test-test:
     needs: paths-filter
     if: ${{ needs.paths-filter.outputs.test == 'true' }}
     name: Test (Test Framework)
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-go@v3
-        with:
-          go-version: "1.21"
-      - uses: actions/cache@v1
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-      - name: Test
-        run: make test-test
-      - name: Check tidy
-        run: make check-tidy-test
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - uses: actions/setup-go@v3
+      with:
+        go-version: '1.20'
+    - uses: actions/cache@v1
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: |
+          ${{ runner.os }}-go-
+    - name: Test
+      run: make test-test
+    - name: Check tidy
+      run: make check-tidy-test
 
   test-lint:
     needs: paths-filter
@@ -69,7 +69,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.21"
+          go-version: '1.20'
       - uses: actions/cache@v1
         with:
           path: ~/go/pkg/mod
@@ -94,10 +94,10 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.21"
+          go-version: '1.20'
       - uses: actions/setup-node@v2
         with:
-          node-version: "15"
+          node-version: '15'
       - uses: actions/cache@v1
         with:
           path: ~/go/pkg/mod
@@ -125,7 +125,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.21"
+          go-version: '1.20'
       - uses: actions/cache@v1
         with:
           path: ~/go/pkg/mod
@@ -141,17 +141,17 @@ jobs:
     name: Lint
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-go@v3
-        with:
-          go-version: "1.21"
-      - uses: actions/cache@v1
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-      - name: Check license headers
-        run: make check-headers
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - uses: actions/setup-go@v3
+      with:
+        go-version: '1.20'
+    - uses: actions/cache@v1
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: |
+          ${{ runner.os }}-go-
+    - name: Check license headers
+      run: make check-headers
diff --git a/languageserver/go.mod b/languageserver/go.mod
@@ -1,19 +1,17 @@
 module github.com/onflow/cadence-tools/languageserver
 
-go 1.21
-
-toolchain go1.21.9
+go 1.20
 
 require (
 	github.com/getsentry/sentry-go v0.18.0
 	github.com/google/uuid v1.6.0
 	github.com/mattn/go-isatty v0.0.20
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/onflow/cadence v1.0.0-preview.25
-	github.com/onflow/cadence-tools/lint v1.0.0-preview.16
+	github.com/onflow/cadence-tools/lint v1.0.0-preview.17
 	github.com/onflow/cadence-tools/test v1.0.0-preview.15
 	github.com/onflow/flow-go-sdk v1.0.0-preview.25
-	github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.17
+	github.com/onflow/flowkit/v2 v2.0.0-stable-cadence-alpha.18
 	github.com/sourcegraph/jsonrpc2 v0.1.0
 	github.com/spf13/afero v1.10.0
 	github.com/spf13/pflag v1.0.5
@@ -100,7 +98,7 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/invopop/jsonschema v0.7.0 // indirect
 	github.com/ipfs/bbloom v0.0.4 // indirect
-	github.com/ipfs/boxo v0.19.0 // indirect
+	github.com/ipfs/boxo v0.17.1-0.20240131173518-89bceff34bf1 // indirect
 	github.com/ipfs/go-block-format v0.2.0 // indirect
 	github.com/ipfs/go-cid v0.4.1 // indirect
 	github.com/ipfs/go-datastore v0.6.0 // indirect