diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e415a9bac..7f0acb9ac 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: run: ./gradlew library:testDebug library-integration: name: Library (Integration Tests) - runs-on: warp-macos-13-arm64-6x + runs-on: macos-latest steps: - name: Checkout project sources uses: actions/checkout@v3 diff --git a/dev/build_validation_service_local b/dev/build_validation_service_local deleted file mode 100755 index 95c18f581..000000000 --- a/dev/build_validation_service_local +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env sh -set -eu - -# Check if x86_64-linux-gnu-gcc is installed AND that the user is on a mac -if [ ! -x "$(command -v x86_64-linux-gnu-gcc)" ] && [ "$(uname)" = "Darwin" ]; then - echo "Installing cross compile toolchain" - brew tap messense/macos-cross-toolchains - brew install x86_64-unknown-linux-gnu -fi - -rustup target add x86_64-unknown-linux-gnu -export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=x86_64-linux-gnu-gcc -cargo build --release --package mls_validation_service --target x86_64-unknown-linux-gnu -mkdir -p .cache -cp -f ./target/x86_64-unknown-linux-gnu/release/mls-validation-service ./.cache/mls-validation-service -docker build --platform=linux/amd64 -t xmtp/mls-validation-service:latest -f ./dev/validation_service/local.Dockerfile . \ No newline at end of file diff --git a/dev/up b/dev/up index 843f8071b..49ea0deb8 100755 --- a/dev/up +++ b/dev/up @@ -15,5 +15,4 @@ fi rustup update -#dev/build_validation_service_local dev/local/up diff --git a/dev/validation_service/Dockerfile b/dev/validation_service/Dockerfile deleted file mode 100644 index fbb8cf630..000000000 --- a/dev/validation_service/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM rust:1-bullseye as builder -WORKDIR /code -COPY . . -RUN cargo build --release --package mls_validation_service - -FROM debian:bullseye-slim -RUN apt-get update && apt-get install -y sqlite3 -COPY --from=builder /code/target/release/mls-validation-service /usr/local/bin/mls-validation-service -ENV RUST_LOG=info -CMD ["mls-validation-service"] \ No newline at end of file diff --git a/dev/validation_service/local.Dockerfile b/dev/validation_service/local.Dockerfile deleted file mode 100644 index b284be590..000000000 --- a/dev/validation_service/local.Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM debian:stable-slim -RUN apt-get update && apt-get install -y sqlite3 -COPY .cache/mls-validation-service /usr/local/bin/mls-validation-service -ENV RUST_LOG=info -CMD ["mls-validation-service"] \ No newline at end of file