Merge pull request #6080 from onflow/fxamacker/update-atree-inlining-…

…cadence-v1.0

Update feature/atree-inlining-cadence-v1.0 to latest master

.github/workflows/cd.yml

@@ -2,10 +2,13 @@ name: CD
 
 on:
   push:
-    tags: 
+    tags:
       - '*'
       - "!daily-*"
 
+env:
+  GO_VERSION: "1.22"
+
 jobs:
   docker-push:
     name: Push to container registry
@@ -15,7 +18,7 @@ jobs:
       uses: actions/setup-go@v4
       timeout-minutes: 10 # fail fast. sometimes this step takes an extremely long time
       with:
-        go-version: "1.20"
+        go-version: ${{ env.GO_VERSION }}
     - name: Checkout repo
       uses: actions/checkout@v2
     # Provide Google Service Account credentials to Github Action, allowing interaction with the Google Container Registry

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ on:
       - master
 
 env:
-  GO_VERSION: "1.20"
+  GO_VERSION: "1.22"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
@@ -43,7 +43,7 @@ jobs:
         go-version: ${{ env.GO_VERSION }}
         cache: true
     - name: Run go generate
-      run: go generate
+      run: go generate ./...
       working-directory: ${{ matrix.dir }}
     - name: Run golangci-lint
       uses: golangci/golangci-lint-action@v3
@@ -54,7 +54,7 @@ jobs:
         working-directory: ${{ matrix.dir }}
         # https://github.com/golangci/golangci-lint-action/issues/244
         skip-cache: true
-    
+
 
   tidy:
     name: Tidy

.github/workflows/flaky-test-monitor.yml

@@ -13,7 +13,7 @@ env:
   BIGQUERY_DATASET: production_src_flow_test_metrics
   BIGQUERY_TABLE: skipped_tests
   BIGQUERY_TABLE2: test_results
-  GO_VERSION: "1.20"
+  GO_VERSION: "1.22"
   SKIPPED_TESTS_FILE: skipped-tests
   RESULTS_FILE: test-results
   COMMIT_SHA: ${{ github.sha }}

.github/workflows/tools.yml

@@ -13,6 +13,9 @@ on:
         required: false
         type: boolean
 
+env:
+  GO_VERSION: "1.22"
+
 jobs:
   build-publish:
     name: Build boot tools
@@ -31,7 +34,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v4
       with:
-        go-version: "1.20"
+        go-version: ${{ env.GO_VERSION }}
     - name: Checkout repo
       uses: actions/checkout@v3
       with:

Makefile

@@ -77,7 +77,7 @@ unittest-main:
 .PHONY: install-mock-generators
 install-mock-generators:
 	cd ${GOPATH}; \
-    go install github.com/vektra/mockery/v2@v2.21.4; \
+    go install github.com/vektra/mockery/v2@v2.43.2; \
     go install github.com/golang/mock/[email protected];
 
 .PHONY: install-tools
@@ -654,7 +654,7 @@ docker-push-collection-without-adx:
 docker-push-collection-without-netgo-without-adx:
 	docker push "$(CONTAINER_REGISTRY)/collection:$(IMAGE_TAG_NO_NETGO_NO_ADX)"
 
-.PHONY: docker-push-collection-arm 
+.PHONY: docker-push-collection-arm
 docker-push-collection-arm:
 	docker push "$(CONTAINER_REGISTRY)/collection:$(IMAGE_TAG_ARM)"
 
@@ -674,7 +674,7 @@ docker-push-consensus-without-adx:
 docker-push-consensus-without-netgo-without-adx:
 	docker push "$(CONTAINER_REGISTRY)/consensus:$(IMAGE_TAG_NO_NETGO_NO_ADX)"
 
-.PHONY: docker-push-consensus-arm 
+.PHONY: docker-push-consensus-arm
 docker-push-consensus-arm:
 	docker push "$(CONTAINER_REGISTRY)/consensus:$(IMAGE_TAG_ARM)"
 
@@ -698,7 +698,7 @@ docker-push-execution-without-adx:
 docker-push-execution-without-netgo-without-adx:
 	docker push "$(CONTAINER_REGISTRY)/execution:$(IMAGE_TAG_NO_NETGO_NO_ADX)"
 
-.PHONY: docker-push-execution-arm 
+.PHONY: docker-push-execution-arm
 docker-push-execution-arm:
 	docker push "$(CONTAINER_REGISTRY)/execution:$(IMAGE_TAG_ARM)"
 
@@ -722,7 +722,7 @@ docker-push-verification-corrupt:
 docker-push-verification-without-netgo-without-adx:
 	docker push "$(CONTAINER_REGISTRY)/verification:$(IMAGE_TAG_NO_NETGO_NO_ADX)"
 
-.PHONY: docker-push-verification-arm 
+.PHONY: docker-push-verification-arm
 docker-push-verification-arm:
 	docker push "$(CONTAINER_REGISTRY)/verification:$(IMAGE_TAG_ARM)"
 
@@ -746,7 +746,7 @@ docker-push-access-corrupt:
 docker-push-access-without-netgo-without-adx:
 	docker push "$(CONTAINER_REGISTRY)/access:$(IMAGE_TAG_NO_NETGO_NO_ADX)"
 
-.PHONY: docker-push-access-arm 
+.PHONY: docker-push-access-arm
 docker-push-access-arm:
 	docker push "$(CONTAINER_REGISTRY)/access:$(IMAGE_TAG_ARM)"
 
@@ -767,7 +767,7 @@ docker-push-observer-without-adx:
 docker-push-observer-without-netgo-without-adx:
 	docker push "$(CONTAINER_REGISTRY)/observer:$(IMAGE_TAG_NO_NETGO_NO_ADX)"
 
-.PHONY: docker-push-observer-arm 
+.PHONY: docker-push-observer-arm
 docker-push-observer-arm:
 	docker push "$(CONTAINER_REGISTRY)/observer:$(IMAGE_TAG_ARM)"