Merge pull request #2593 from onflow/bastian/sync-stable-cadence-2

.github/workflows/downstream.yml

@@ -40,7 +40,7 @@ jobs:
         run: sh crypto_setup.sh
 
       - name: Update Cadence
-        run: go get github.com/onflow/cadence@${{ github.event.pull_request.head.sha }}
+        run: go mod edit -replace github.com/onflow/cadence=github.com/${{ github.event.pull_request.head.repo.full_name }}@${{ github.event.pull_request.head.sha }}
 
       - name: Tidy up
         run: go mod tidy
@@ -65,7 +65,7 @@ jobs:
           cache: true
 
       - name: Update Cadence
-        run: go get github.com/onflow/cadence@${{ github.event.pull_request.head.sha }}
+        run: go mod edit -replace github.com/onflow/cadence=github.com/${{ github.event.pull_request.head.repo.full_name }}@${{ github.event.pull_request.head.sha }}
 
       - name: Tidy up
         run: go mod tidy

.golangci.yml

@@ -17,6 +17,9 @@ linters:
     - goimports
     - unconvert
     - nilerr
+    - forbidigo
+    - bidichk
+    - asciicheck
 
 issues:
   exclude-rules:
@@ -38,6 +41,10 @@ linters-settings:
       - exitAfterDefer
   goimports:
     local-prefixes: github.com/onflow/cadence
+  forbidigo:
+    forbid:
+      - '^maps.Keys.*(# has indeterminate order\.)?$'
+      - '^maps.Values.*(# has indeterminate order\.)?$'
   custom:
     maprange:
       path: tools/maprange/maprange.so

Makefile

@@ -96,6 +96,13 @@ tools/constructorcheck/constructorcheck.so:
 tools/golangci-lint/golangci-lint:
 	(cd tools/golangci-lint && $(MAKE))
 
+.PHONY: clean-linter
+clean-linter:
+	rm -f tools/golangci-lint/golangci-lint \
+		tools/maprange/maprange.so \
+		tools/unkeyed/unkeyed.so \
+		tools/constructorcheck/constructorcheck.so
+
 .PHONY: check-headers
 check-headers:
 	@./check-headers.sh