Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(relay): rust build fails after tokio bump from 0.2.25 to 1.18.5 #2359

Merged
merged 1 commit into from
Mar 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test_weaver-asset-exchange-fabric.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ jobs:
run: |
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
unzip protoc-3.15.6-linux-x86_64.zip -d protoc
go install google.golang.org/protobuf/cmd/protoc-gen-go
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest

# PROTOS
- name: Build JS Protos
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_weaver-asset-transfer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -454,8 +454,8 @@ jobs:
run: |
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
unzip protoc-3.15.6-linux-x86_64.zip -d protoc
go install google.golang.org/protobuf/cmd/protoc-gen-go
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest

# PROTOS
- name: Build GO Protos
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test_weaver-data-sharing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ jobs:
run: |
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
unzip protoc-3.15.6-linux-x86_64.zip -d protoc
go install google.golang.org/protobuf/cmd/protoc-gen-go
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest

# PROTOS
- name: Build GO Protos
Expand Down Expand Up @@ -748,8 +748,8 @@ jobs:
run: |
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
unzip protoc-3.15.6-linux-x86_64.zip -d protoc
go install google.golang.org/protobuf/cmd/protoc-gen-go
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest

# PROTOS
- name: Build GO Protos
Expand Down
126 changes: 109 additions & 17 deletions .github/workflows/test_weaver-relay.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,84 +21,176 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: Install RUST Toolchain minimal stable with clippy and rustfmt
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
components: rustfmt, clippy

- name: Use Protoc 3.15
run: |
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
unzip protoc-3.15.6-linux-x86_64.zip -d protoc

- name: Build Protos RS
run: make build
run: |
export PATH="$PATH:${GITHUB_WORKSPACE}/protoc/bin"
make build
working-directory: weaver/common/protos-rs

- name: Get Latest Relay Dependencies
run: |
make protos-local
cargo update -p nom
cargo update -p lexical-core
working-directory: weaver/core/relay

- name: Build Image
run: make
working-directory: weaver/core/relay

- name: Run Dummy Relay
run: RELAY_CONFIG=config/Dummy_Relay.toml cargo run --bin server &> relay-dummy.out &
working-directory: weaver/core/relay

- name: Run Dummy Driver
run: RELAY_CONFIG=config/Dummy_Relay.toml cargo run --bin dummy-driver &> driver-dummy.out &
working-directory: weaver/core/relay

- name: Mock Client Test
run: |
echo "Waiting for Dummy Relay and Driver to come up"
sleep 30
cargo run --bin client 9085 localhost:9085/Dummy_Network/abc:abc:abc:abc
working-directory: weaver/core/relay
relay:

relay-tls-local:
# if: ${{ false }}
runs-on: buildjet-2vcpu-ubuntu-2204
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: Install RUST Toolchain minimal stable with clippy and rustfmt
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
components: rustfmt, clippy


- name: Use Protoc 3.15
run: |
curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
unzip protoc-3.15.6-linux-x86_64.zip -d protoc

- name: Build Protos RS
run: |
export PATH="$PATH:${GITHUB_WORKSPACE}/protoc/bin"
make build
working-directory: weaver/common/protos-rs

- name: Get Latest Relay Dependencies
run: |
make protos-local
cargo update -p nom
cargo update -p lexical-core
working-directory: weaver/core/relay


- name: Build Image
run: make
working-directory: weaver/core/relay

- name: Run Dummy Relay
run: RELAY_CONFIG=config/Dummy_Relay_tls.toml cargo run --bin server &> relay-dummy.out &
working-directory: weaver/core/relay

- name: Run Dummy Driver
run: RELAY_CONFIG=config/Dummy_Relay_tls.toml cargo run --bin dummy-driver &> driver-dummy.out &
working-directory: weaver/core/relay

- name: Mock Client Test
run: |
echo "Waiting for Dummy Relay and Driver to come up"
sleep 30
cargo run --bin client-tls 9085 localhost:9085/Dummy_Network/abc:abc:abc:abc
working-directory: weaver/core/relay

relay:
if: ${{ false }}
runs-on: buildjet-2vcpu-ubuntu-2204
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: Install RUST Toolchain minimal stable with clippy and rustfmt
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
components: rustfmt, clippy

- name: Get Latest Relay Dependencies
run: |
cargo update -p nom
cargo update -p lexical-core
working-directory: weaver/core/relay

- name: Build Image
run: make build
working-directory: weaver/core/relay

- name: Run Dummy Relay
run: RELAY_CONFIG=config/Dummy_Relay.toml cargo run --bin server &> relay-dummy.out &
working-directory: weaver/core/relay

- name: Run Dummy Driver
run: RELAY_CONFIG=config/Dummy_Relay.toml cargo run --bin dummy-driver &> driver-dummy.out &
working-directory: weaver/core/relay

- name: Mock Client Test
run: |
echo "Waiting for Dummy Relay and Driver to come up"
sleep 30
cargo run --bin client 9085 localhost:9085/Dummy_Network/abc:abc:abc:abc
working-directory: weaver/core/relay

relay-tls:
if: ${{ false }}
runs-on: buildjet-2vcpu-ubuntu-2204
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: Install RUST Toolchain minimal stable with clippy and rustfmt
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
components: rustfmt, clippy

- name: Get Latest Relay Dependencies
run: |
cargo update -p nom
cargo update -p lexical-core
working-directory: weaver/core/relay

- name: Build Image
run: make build
working-directory: weaver/core/relay

- name: Run Dummy Relay
run: RELAY_CONFIG=config/Dummy_Relay_tls.toml cargo run --bin server &> relay-dummy.out &
working-directory: weaver/core/relay

- name: Run Dummy Driver
run: RELAY_CONFIG=config/Dummy_Relay_tls.toml cargo run --bin dummy-driver &> driver-dummy.out &
working-directory: weaver/core/relay

- name: Mock Client Test
run: |
echo "Waiting for Dummy Relay and Driver to come up"
sleep 30
cargo run --bin client-tls 9085 localhost:9085/Dummy_Network/abc:abc:abc:abc
working-directory: weaver/core/relay
Loading