From 51700eff5a8ef72f12b487ea746078a1ca609d09 Mon Sep 17 00:00:00 2001 From: Ardit Marku Date: Tue, 31 Oct 2023 12:15:47 +0200 Subject: [PATCH] Update flow-cli version to v1.5.0 for CI workflow --- .github/workflows/integration-tests.yml | 2 +- flow.json | 8 -------- normalize_coverage_report.sh | 24 ++++++++++++------------ 3 files changed, 13 insertions(+), 21 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 5b78929..1af3875 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -20,7 +20,7 @@ jobs: with: go-version: 1.18 - name: Install Flow CLI - run: bash -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)" -- v1.4.4 + run: bash -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)" -- v1.5.0 - name: Run tests run: sh ./test.sh - name: Normalize coverage report filepaths diff --git a/flow.json b/flow.json index 0de106d..967a5f2 100644 --- a/flow.json +++ b/flow.json @@ -4,7 +4,6 @@ "source": "./modules/flow-utils/cadence/contracts/AddressUtils.cdc", "aliases": { "emulator": "f8d6e0586b0a20c7", - "testing": "0000000000000007", "testnet": "31ad40c07a2a9788", "mainnet": "a340dc0a4ec828ab" } @@ -13,7 +12,6 @@ "source": "./modules/flow-utils/cadence/contracts/ArrayUtils.cdc", "aliases": { "emulator": "f8d6e0586b0a20c7", - "testing": "0000000000000007", "testnet": "31ad40c07a2a9788", "mainnet": "a340dc0a4ec828ab" } @@ -112,7 +110,6 @@ "source": "", "aliases": { "emulator": "0ae53cb6e3f42a79", - "testing": "0000000000000003", "testnet": "7e60df042a9c0868", "mainnet": "1654653399040a61" } @@ -121,7 +118,6 @@ "source": "./modules/flow-nft/contracts/utility/FungibleToken.cdc", "aliases": { "emulator": "ee82856bf20e2aa6", - "testing": "0000000000000002", "testnet": "9a0766d93b6608b7", "mainnet": "f233dcee88fe0abe" } @@ -139,7 +135,6 @@ "source": "./modules/flow-nft/contracts/MetadataViews.cdc", "aliases": { "emulator": "f8d6e0586b0a20c7", - "testing": "0000000000000001", "testnet": "631e88ae7f1d7c20", "mainnet": "1d7e57aa55817448" } @@ -174,7 +169,6 @@ "source": "./modules/flow-nft/contracts/NonFungibleToken.cdc", "aliases": { "emulator": "f8d6e0586b0a20c7", - "testing": "0000000000000001", "testnet": "631e88ae7f1d7c20", "mainnet": "1d7e57aa55817448" } @@ -183,7 +177,6 @@ "source": "./modules/flow-utils/cadence/contracts/StringUtils.cdc", "aliases": { "emulator": "f8d6e0586b0a20c7", - "testing": "0000000000000007", "testnet": "31ad40c07a2a9788", "mainnet": "a340dc0a4ec828ab" } @@ -192,7 +185,6 @@ "source": "./modules/flow-nft/contracts/ViewResolver.cdc", "aliases": { "emulator": "f8d6e0586b0a20c7", - "testing": "0000000000000001", "testnet": "631e88ae7f1d7c20", "mainnet": "1d7e57aa55817448" } diff --git a/normalize_coverage_report.sh b/normalize_coverage_report.sh index eab7a49..93ae949 100755 --- a/normalize_coverage_report.sh +++ b/normalize_coverage_report.sh @@ -1,14 +1,14 @@ -sed -i 's/A.01cf0e2f2f715450.CapabilityDelegator/contracts\/CapabilityDelegator.cdc/' coverage.lcov -sed -i 's/A.01cf0e2f2f715450.CapabilityFactory/contracts\/CapabilityFactory.cdc/' coverage.lcov -sed -i 's/A.01cf0e2f2f715450.CapabilityFilter/contracts\/CapabilityFilter.cdc/' coverage.lcov -sed -i 's/A.01cf0e2f2f715450.ExampleNFT/contracts\/ExampleNFT.cdc/' coverage.lcov -sed -i 's/A.01cf0e2f2f715450.ExampleNFT2/contracts\/ExampleNFT2.cdc/' coverage.lcov -sed -i 's/A.01cf0e2f2f715450.ExampleToken/contracts\/ExampleToken.cdc/' coverage.lcov -sed -i 's/A.01cf0e2f2f715450.FTBalanceFactory/contracts\/FTBalanceFactory.cdc/' coverage.lcov -sed -i 's/A.01cf0e2f2f715450.FTProviderFactory/contracts\/FTProviderFactory.cdc/' coverage.lcov -sed -i 's/A.01cf0e2f2f715450.FTReceiverFactory/contracts\/FTReceiverFactory.cdc/' coverage.lcov -sed -i 's/A.01cf0e2f2f715450.HybridCustody/contracts\/HybridCustody.cdc/' coverage.lcov -sed -i 's/A.01cf0e2f2f715450.NFTCollectionPublicFactory/contracts\/NFTCollectionPublicFactory.cdc/' coverage.lcov -sed -i 's/A.01cf0e2f2f715450.NFTProviderFactory/contracts\/NFTProviderFactory.cdc/' coverage.lcov +sed -i 's/A.0000000000000007.CapabilityDelegator/contracts\/CapabilityDelegator.cdc/' coverage.lcov +sed -i 's/A.0000000000000007.CapabilityFactory/contracts\/CapabilityFactory.cdc/' coverage.lcov +sed -i 's/A.0000000000000007.CapabilityFilter/contracts\/CapabilityFilter.cdc/' coverage.lcov +sed -i 's/A.0000000000000007.ExampleNFT/contracts\/ExampleNFT.cdc/' coverage.lcov +sed -i 's/A.0000000000000007.ExampleNFT2/contracts\/ExampleNFT2.cdc/' coverage.lcov +sed -i 's/A.0000000000000007.ExampleToken/contracts\/ExampleToken.cdc/' coverage.lcov +sed -i 's/A.0000000000000007.FTBalanceFactory/contracts\/FTBalanceFactory.cdc/' coverage.lcov +sed -i 's/A.0000000000000007.FTProviderFactory/contracts\/FTProviderFactory.cdc/' coverage.lcov +sed -i 's/A.0000000000000007.FTReceiverFactory/contracts\/FTReceiverFactory.cdc/' coverage.lcov +sed -i 's/A.0000000000000007.HybridCustody/contracts\/HybridCustody.cdc/' coverage.lcov +sed -i 's/A.0000000000000007.NFTCollectionPublicFactory/contracts\/NFTCollectionPublicFactory.cdc/' coverage.lcov +sed -i 's/A.0000000000000007.NFTProviderFactory/contracts\/NFTProviderFactory.cdc/' coverage.lcov sed -i 's/A.f8d6e0586b0a20c7.MetadataViews/contracts\/MetadataViews.cdc/' coverage.lcov sed -i 's/A.f8d6e0586b0a20c7.NonFungibleToken/contracts\/NonFungibleToken.cdc/' coverage.lcov \ No newline at end of file