From 8cd3fe162ce4778f3ed54576c55bd626e6d8fd44 Mon Sep 17 00:00:00 2001 From: Romain Ruetschi <106849+romac@users.noreply.github.com> Date: Fri, 18 Aug 2023 09:38:33 +0200 Subject: [PATCH] Use only Gaia v11 on CI --- .github/workflows/integration.yaml | 18 ++++------ .github/workflows/misbehaviour.yml | 5 +-- .github/workflows/multi-chains.yaml | 2 +- flake.lock | 54 +++++++++++++++++++---------- 4 files changed, 44 insertions(+), 35 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index eaee23632c..2c9ea2959a 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -45,10 +45,7 @@ jobs: fail-fast: false matrix: chain: - - package: gaia8 - command: gaiad - account_prefix: cosmos - - package: gaia9 + - package: gaia11 command: gaiad account_prefix: cosmos - package: ibc-go-v4-simapp @@ -244,10 +241,7 @@ jobs: fail-fast: false matrix: chain: - - package: gaia8 - command: gaiad - account_prefix: cosmos - - package: gaia9 + - package: gaia11 command: gaiad account_prefix: cosmos - package: juno @@ -372,7 +366,7 @@ jobs: fail-fast: false matrix: chain: - - package: gaia9 + - package: gaia11 command: gaiad account_prefix: cosmos steps: @@ -442,7 +436,7 @@ jobs: CHAIN_COMMAND_PATHS: gaiad,${{ matrix.chain.command }} ACCOUNT_PREFIXES: cosmos,${{ matrix.chain.account_prefix }} run: | - nix shell .#gaia9 .#${{ matrix.chain.package }} -c cargo \ + nix shell .#gaia11 .#${{ matrix.chain.package }} -c cargo \ test -p ibc-integration-test --features interchain-security --no-fail-fast -- \ --nocapture --test-threads=1 interchain_security:: @@ -482,7 +476,7 @@ jobs: CHAIN_COMMAND_PATHS: gaiad,${{ matrix.chain.command }} ACCOUNT_PREFIXES: cosmos,${{ matrix.chain.account_prefix }} run: | - nix shell .#gaia9 .#${{ matrix.chain.package }} -c cargo \ + nix shell .#gaia11 .#${{ matrix.chain.package }} -c cargo \ test -p ibc-integration-test --features interchain-security,ica --no-fail-fast -- \ --nocapture --test-threads=1 interchain_security:: @@ -522,7 +516,7 @@ jobs: CHAIN_COMMAND_PATHS: gaiad,${{ matrix.chain.command }} ACCOUNT_PREFIXES: cosmos,${{ matrix.chain.account_prefix }} run: | - nix shell .#gaia9 .#${{ matrix.chain.package }} -c cargo \ + nix shell .#gaia11 .#${{ matrix.chain.package }} -c cargo \ test -p ibc-integration-test --features interchain-security,ics31 --no-fail-fast -- \ --nocapture --test-threads=1 interchain_security:: diff --git a/.github/workflows/misbehaviour.yml b/.github/workflows/misbehaviour.yml index d6790317d5..dfb02ffe5f 100644 --- a/.github/workflows/misbehaviour.yml +++ b/.github/workflows/misbehaviour.yml @@ -43,10 +43,7 @@ jobs: fail-fast: false matrix: chain: - - package: gaia8 - command: gaiad - account_prefix: cosmos - - package: gaia9 + - package: gaia11 command: gaiad account_prefix: cosmos steps: diff --git a/.github/workflows/multi-chains.yaml b/.github/workflows/multi-chains.yaml index 4b8a44e015..cd38c02296 100644 --- a/.github/workflows/multi-chains.yaml +++ b/.github/workflows/multi-chains.yaml @@ -58,7 +58,7 @@ jobs: fail-fast: false matrix: first-package: - - package: gaia9 + - package: gaia11 command: gaiad account_prefix: cosmos - package: ibc-go-v7-simapp diff --git a/flake.lock b/flake.lock index 18a9bcf689..be1c4ebc3f 100644 --- a/flake.lock +++ b/flake.lock @@ -34,20 +34,37 @@ "type": "github" } }, + "beaker-src": { + "flake": false, + "locked": { + "lastModified": 1686823358, + "narHash": "sha256-bQiN5Q7RV4Uupc7rk1rGurRvCTy+5EiiB4p3bHct7M0=", + "owner": "osmosis-labs", + "repo": "beaker", + "rev": "f3c7a9fc6886aa2b4e0d259f70058d6c23c225e5", + "type": "github" + }, + "original": { + "owner": "osmosis-labs", + "ref": "v0.1.6", + "repo": "beaker", + "type": "github" + } + }, "centauri-src": { "flake": false, "locked": { - "lastModified": 1689290261, - "narHash": "sha256-S3zu7pSUF+7jnu06Fj4Co/eUe1wYEB+3CyZoN1sYUdA=", + "lastModified": 1692209286, + "narHash": "sha256-fabsZyaSCnWnhvG9nO8y39t85u+MZNyEKzU+0fSueLM=", "owner": "dzmitry-lahoda-forks", "repo": "composable-centauri", - "rev": "6b8d9fa640d7e5e0986b637bfec4a74c87ced280", + "rev": "9fa53d8b47d17219d1270146a146e4e386bc2a29", "type": "github" }, "original": { "owner": "dzmitry-lahoda-forks", "repo": "composable-centauri", - "rev": "6b8d9fa640d7e5e0986b637bfec4a74c87ced280", + "rev": "9fa53d8b47d17219d1270146a146e4e386bc2a29", "type": "github" } }, @@ -55,6 +72,7 @@ "inputs": { "akash-src": "akash-src", "apalache-src": "apalache-src", + "beaker-src": "beaker-src", "centauri-src": "centauri-src", "cosmos-sdk-src": "cosmos-sdk-src", "cosmwasm-src": "cosmwasm-src", @@ -117,11 +135,11 @@ "wasmvm_1_beta7-src": "wasmvm_1_beta7-src" }, "locked": { - "lastModified": 1690188204, - "narHash": "sha256-b1na7/tipiaLQdmAelpyYBpqcHrI+SIrKETZK0j93PA=", + "lastModified": 1692218955, + "narHash": "sha256-8d8LynIwGDCLEXax16NvsJ7/2DYp5mEC/rXQttgATC0=", "owner": "informalsystems", "repo": "cosmos.nix", - "rev": "425e5a99fcfbe78ccd4f65865bcf8f9f8bfd0728", + "rev": "716b7b802d27c6d002419b1e01369aba492592a8", "type": "github" }, "original": { @@ -527,16 +545,16 @@ "ibc-go-v7-src": { "flake": false, "locked": { - "lastModified": 1686298823, - "narHash": "sha256-8ModVWpRWbwWQLj5BCCopn7vpOJjFp4ISESCCp4pqWQ=", + "lastModified": 1687464721, + "narHash": "sha256-UsCzjLKyedW2h3PQDNUNNL7KZiD23MM6kPQSnKS8FNs=", "owner": "cosmos", "repo": "ibc-go", - "rev": "000e9d20b15b3c6939cefc0e26daa4b64c1be8fb", + "rev": "d02ab9db8fc80eb5e55041d3d6416370c33441f7", "type": "github" }, "original": { "owner": "cosmos", - "ref": "v7.1.0", + "ref": "v7.2.0", "repo": "ibc-go", "type": "github" } @@ -758,11 +776,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1690083312, - "narHash": "sha256-I3egwgNXavad1eIjWu1kYyi0u73di/sMmlnQIuzQASk=", + "lastModified": 1692279307, + "narHash": "sha256-7BMWvpLpGs3zvAm0c1HVYVoVIe0m0Cfp2GPpqxDte3U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "af8cd5ded7735ca1df1a1174864daab75feeb64a", + "rev": "02bba6c619c91e8c8eef9ba1129d0eff31741445", "type": "github" }, "original": { @@ -775,16 +793,16 @@ "osmosis-src": { "flake": false, "locked": { - "lastModified": 1687920590, - "narHash": "sha256-nzNUf55ZgWUuaEJ25hvGi34zzqTuWOGm3j72BtldGxs=", + "lastModified": 1689430935, + "narHash": "sha256-HTXFitKRuxSM6U2Sq7kgLxZhduPA+MofdWaISe//2kg=", "owner": "osmosis-labs", "repo": "osmosis", - "rev": "4a4a94585872e3196b9c83286979cda11d4889e3", + "rev": "0dcae3392f23e44b8de436ff372c1373dc831b04", "type": "github" }, "original": { "owner": "osmosis-labs", - "ref": "v15.2.0", + "ref": "v16.1.1", "repo": "osmosis", "type": "github" }