Skip to content

Commit

Permalink
Remove db migration test
Browse files Browse the repository at this point in the history
The diesel version is now so old it's throwing Rust warnings, I'll pull
this out of the history when/if I need to use it.

This finaly lets us remove all the postgres related stuff
  • Loading branch information
jkilpatr committed Dec 5, 2024
1 parent 295140e commit 5c8cff9
Show file tree
Hide file tree
Showing 20 changed files with 8 additions and 937 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,4 @@ jobs:
with:
cache-on-failure: true
- name: Run integration test
run: bash scripts/integration_tests/all-up-test-ci.sh CONTRACT_TEST
integration-test-db-migration:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
- name: Run integration test
run: bash scripts/integration_tests/all-up-test-ci.sh MIGRATION_TEST
run: bash scripts/integration_tests/all-up-test-ci.sh CONTRACT_TEST
93 changes: 0 additions & 93 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ members = [
"rita_common",
"rita_exit",
"rita_client",
"rita_db_migration",
"rita_bin",
"test_runner",
"integration_tests",
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ Rita supports either [Althea L1](https://github.com/althea-net/althea-L1) or any

Debian:

sudo apt-get install build-essential libssl-dev libsqlite3-dev pkg-config postgresql-server-dev-all automake liboping-dev libtool perl clang
sudo apt-get install build-essential libssl-dev libsqlite3-dev pkg-config automake liboping-dev libtool perl clang

Ubuntu:

sudo apt-get install build-essential libssl-dev libsqlite3-dev pkg-config postgresql-server-dev-all automake liboping-dev libtool perl clang
sudo apt-get install build-essential libssl-dev libsqlite3-dev pkg-config automake liboping-dev libtool perl clang

Centos:

sudo yum install gcc gcc-c++ openssl-devel sqlite-devel make postgresql-devel automake liboping-devel libtool perl clang
sudo yum install gcc gcc-c++ openssl-devel sqlite-devel make automake liboping-devel libtool perl clang

Fedora:

sudo dnf install gcc gcc-c++ openssl-devel sqlite-devel make postgresql-devel automake liboping-devel libtool perl clang
sudo dnf install gcc gcc-c++ openssl-devel sqlite-devel make automake liboping-devel libtool perl clang

Arch:

Expand Down
3 changes: 0 additions & 3 deletions integration_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ rita_client = { path = "../rita_client", features = ["dev_env"] }
rita_common = { path = "../rita_common", features = ["integration_test"] }
rita_exit = { path = "../rita_exit", features = ["dev_env"] }
exit_trust_root = { path = "../exit_trust_root", features = ["development"] }
rita_db_migration = { path = "../rita_db_migration" }
ctrlc = { version = "3.4.5", features = ["termination"] }
diesel = { version = "1.4", features = ["postgres", "r2d2"] }
diesel_migrations = { version = "1.4", features = ["postgres"] }
awc = {workspace = true}
actix-rt = {workspace = true}
deep_space = {workspace = true}
Expand Down
6 changes: 2 additions & 4 deletions integration_tests/container/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
FROM postgres
FROM debian:bookworm
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y sudo iputils-ping iproute2 jq vim netcat-traditional default-libmysqlclient-dev libsqlite3-dev libpq-dev python3-pip bridge-utils wireguard linux-source curl git libssl-dev pkg-config build-essential ipset python3-setuptools python3-wheel dh-autoreconf procps net-tools iperf3 babeld make locales-all npm
RUN apt-get update && apt-get install -y sudo iputils-ping iproute2 jq vim netcat-traditional python3-pip bridge-utils wireguard linux-source curl git libssl-dev pkg-config build-essential ipset python3-setuptools python3-wheel dh-autoreconf procps net-tools iperf3 babeld make locales-all npm
# Install Rust
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
ENV PATH=$PATH:/root/.cargo/bin/
# Setup postgres db for Althea exits
RUN cargo install diesel_cli --force
# Install Babeld for Althea routing
RUN cd /var && git clone -b master https://github.com/althea-mesh/babeld.git
RUN cd /var/babeld/ && make install
Expand Down
Loading

0 comments on commit 5c8cff9

Please sign in to comment.