From e126e2be82d1e2c7292cab44b3f0450321522ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20M=C3=BCller?= Date: Thu, 20 Jun 2024 12:00:24 -0700 Subject: [PATCH 1/2] Cadence 1.0 feature branches in flixkit and flow-cli got merged --- tools/update/config.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/update/config.yaml b/tools/update/config.yaml index c028c51e06..cdfb2f68e5 100644 --- a/tools/update/config.yaml +++ b/tools/update/config.yaml @@ -78,7 +78,6 @@ repos: - repo: onflow/flixkit-go needsRelease: true - branch: feature/stable-cadence mods: - path: "" deps: @@ -105,7 +104,6 @@ repos: - repo: onflow/flow-cli needsRelease: true - branch: feature/stable-cadence mods: - path: "" deps: From 0f695d7a996c07b97306b8f06824649a94d9a49d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20M=C3=BCller?= Date: Thu, 20 Jun 2024 14:16:32 -0700 Subject: [PATCH 2/2] fix Flow CLI setup and command --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e38d2d98e..eeeaeb07bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: cache: true - name: Install Flow CLI - run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)" -- v1.5.0 + run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)" - name: Build run: make -j8 build @@ -49,7 +49,7 @@ jobs: run: make ci - name: Cadence Testing Framework - run: cd runtime/stdlib/contracts && flow test --cover --covercode="contracts" crypto_test.cdc + run: cd runtime/stdlib/contracts && flow-c1 test --cover --covercode="contracts" crypto_test.cdc - name: Upload coverage report uses: codecov/codecov-action@v2