From d443ed28c956f3ab4cfcb4b81e37028be0033fb7 Mon Sep 17 00:00:00 2001 From: Sandipan Dey Date: Sun, 11 Feb 2024 21:45:19 +0530 Subject: [PATCH] chore: tilt ci process is spinning up backend deps --- .envrc | 2 +- .github/workflows/ci.yml | 42 +++++++++++++++++++ .gitignore | 1 - Makefile | 4 +- dev/.env | 2 + dev/Tiltfile | 18 ++++++++ dev/bin/blocks.sh | 12 ++++++ dev/bin/setup.sh | 25 +++++++++++ .../galoy-quickstart/docker-compose.yml | 2 + 9 files changed, 104 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/ci.yml create mode 100644 dev/.env create mode 100755 dev/bin/blocks.sh create mode 100755 dev/bin/setup.sh diff --git a/.envrc b/.envrc index c333d1ee24..7771fa5c7d 100644 --- a/.envrc +++ b/.envrc @@ -2,4 +2,4 @@ if [ -f ".env.local" ]; then dotenv .env.local fi - use flake . + use flake ./dev diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000000..9a412b4f78 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,42 @@ +name: E2E against Local + +on: [push] + +jobs: + tilt-ci-android: + name: Tilt CI Android + runs-on: ["self-hosted", "Linux", "X64"] + + steps: + - uses: actions/checkout@v2 + - uses: DeterminateSystems/magic-nix-cache-action@v2 + - name: Tilt CI + run: | + for i in {1..5}; do + echo "Tilt CI attempt $i" + nix develop -c sh -c 'cd dev && tilt ci' && exit 0 || sleep 15 + done + exit 1 + - name: Destroy backend + if: always() + continue-on-error: true + run: nix develop -c sh -c 'cd dev && tilt down' + + tilt-ci-ios: + name: Tilt CI MacOS + runs-on: ["self-hosted", "MacOS", "ARM64"] + + steps: + - uses: actions/checkout@v2 + - uses: DeterminateSystems/magic-nix-cache-action@v2 + - name: Tilt CI + run: | + for i in {1..5}; do + echo "Tilt CI attempt $i" + nix develop -c sh -c 'cd dev && tilt ci' && exit 0 || sleep 15 + done + exit 1 + - name: Destroy backend + if: always() + continue-on-error: true + run: nix develop -c sh -c 'cd dev && tilt down' diff --git a/.gitignore b/.gitignore index c1af39c5a3..022f8c6869 100644 --- a/.gitignore +++ b/.gitignore @@ -75,7 +75,6 @@ yalc.lock *.log -.env .dependencies ios/assets ios/GaloyApp/assets diff --git a/Makefile b/Makefile index a4a3d85d61..c14dc4a0bc 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ start: yarn start tilt-up: - cd dev && GALOY_QUICKSTART_PATH="dev/vendor/galoy-quickstart" tilt up + cd dev && tilt up tilt-down: - cd dev && GALOY_QUICKSTART_PATH="dev/vendor/galoy-quickstart" tilt down + cd dev && tilt down diff --git a/dev/.env b/dev/.env new file mode 100644 index 0000000000..9ed68f86c3 --- /dev/null +++ b/dev/.env @@ -0,0 +1,2 @@ +ALICE_PHONE="+919876540001" +BOB_PHONE="+919876540002" diff --git a/dev/Tiltfile b/dev/Tiltfile index 4926e49750..f57b9f8d08 100644 --- a/dev/Tiltfile +++ b/dev/Tiltfile @@ -31,3 +31,21 @@ for service in bitcoin_services: dc_resource('otel-agent', labels = ["otel"]) dc_resource('quickstart-test', labels = ['quickstart'], auto_init=False) + +local_resource( + name='init-setup', + labels = ['dev-setup'], + cmd='bin/setup.sh', + resource_deps = galoy_services + [ + "init-lightning" + ] +) + +local_resource( + name='blocks', + labels = ['dev-setup'], + serve_cmd='bin/blocks.sh', + resource_deps = [ + "init-setup" + ] +) diff --git a/dev/bin/blocks.sh b/dev/bin/blocks.sh new file mode 100755 index 0000000000..0369178c58 --- /dev/null +++ b/dev/bin/blocks.sh @@ -0,0 +1,12 @@ +#!/bin/bash + + set -e + + REPO_ROOT=$(git rev-parse --show-toplevel) + + source ${REPO_ROOT}/dev/vendor/galoy-quickstart/bin/helpers.sh + + while true; do + bitcoin_cli -generate 1 + sleep 2 + done diff --git a/dev/bin/setup.sh b/dev/bin/setup.sh new file mode 100755 index 0000000000..9dc2c54989 --- /dev/null +++ b/dev/bin/setup.sh @@ -0,0 +1,25 @@ +#!/bin/bash + + set -e + + REPO_ROOT=$(git rev-parse --show-toplevel) + + source ${REPO_ROOT}/dev/vendor/galoy-quickstart/bin/helpers.sh + source ${REPO_ROOT}/dev/.env + + login_user "alice" "$ALICE_PHONE" "000000" + echo "alice logged in" + ALICE_TOKEN=$(read_value "alice") + receive_onchain + echo "alice funded" + + login_user "alice" "$BOB_PHONE" "000000" + echo "bob logged in" + BOB_TOKEN=$(read_value "alice") + receive_onchain + echo "bob funded" + + cat < .env.tmp.ci + ALICE_TOKEN="$ALICE_TOKEN" + BOB_TOKEN="$BOB_TOKEN" + EOF diff --git a/dev/vendor/galoy-quickstart/docker-compose.yml b/dev/vendor/galoy-quickstart/docker-compose.yml index 951b087fea..f3a488b360 100644 --- a/dev/vendor/galoy-quickstart/docker-compose.yml +++ b/dev/vendor/galoy-quickstart/docker-compose.yml @@ -219,6 +219,8 @@ services: - OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-agent:4318 ports: - 6685:6685 + links: + - notifications-pg:notifications-pg notifications-pg: image: postgres:14.1 environment: