diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 211d6aab..0e0f5404 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,19 +31,17 @@ jobs: - name: Pull LFS files run: git lfs pull - run: | - nix --version - echo test make build if: "env.GIT_DIFF != ''" build-nix: strategy: matrix: - os: [nixos, macos-latest] - runs-on: ${{ matrix.os }} + runner: [nix, macos-latest] + runs-on: ${{ matrix.runner }} steps: - uses: actions/checkout@v4 - uses: haqq-network/nix-action@master - if: ${{ matrix.os == 'macos-latest' }} + if: ${{ matrix.runner == 'macos-latest' }} with: installNix: true useCachix: false @@ -56,7 +54,7 @@ jobs: | jq -r '.[].outputs | to_entries[].value' \ | nix run nixpkgs#cachix push haqq check-nix: - runs-on: [self-hosted, nixos] + runs-on: [self-hosted, nix] steps: - uses: actions/checkout@v4 - name: Check if nix package and Makefile versions match diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml index 0ee100a4..ea2ee0fa 100644 --- a/.github/workflows/proto.yml +++ b/.github/workflows/proto.yml @@ -20,7 +20,7 @@ jobs: build: name: Check that proto builds and commited - runs-on: [self-hosted, nixos] + runs-on: [self-hosted, nix] steps: - uses: actions/checkout@v4 - run: | @@ -32,7 +32,7 @@ jobs: timeout-minutes: 5 steps: - uses: actions/checkout@v4 - - uses: bufbuild/buf-setup-action@v1.28.1 + - uses: bufbuild/buf-setup-action@v1 - uses: bufbuild/buf-lint-action@v1 with: input: "proto" @@ -42,7 +42,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: bufbuild/buf-setup-action@v1.28.1 + - uses: bufbuild/buf-setup-action@v1 - uses: bufbuild/buf-breaking-action@v1 with: input: "proto" diff --git a/proto/haqq/liquidvesting/v1/liquidvesting.proto b/proto/haqq/liquidvesting/v1/liquidvesting.proto index 393191f3..9b80e5e0 100644 --- a/proto/haqq/liquidvesting/v1/liquidvesting.proto +++ b/proto/haqq/liquidvesting/v1/liquidvesting.proto @@ -1,12 +1,9 @@ syntax = "proto3"; package haqq.liquidvesting.v1; -import "amino/amino.proto"; import "gogoproto/gogo.proto"; import "cosmos/vesting/v1beta1/vesting.proto"; import "google/protobuf/timestamp.proto"; -import "cosmos/base/v1beta1/coin.proto"; - option go_package = "github.com/haqq-network/haqq/x/liquidvesting/types";