From 3de9ce1771dde698b9353a5f0f07631514411f3b Mon Sep 17 00:00:00 2001 From: vindard <17693119+vindard@users.noreply.github.com> Date: Fri, 22 Dec 2023 16:58:41 -0400 Subject: [PATCH] revert: remove SVIX_CALLBACK_URL from environment (#3748) This reverts commit aef44370cadbf9c320c03105bc8346b5fbbb4f4a. --- .github/workflows/bats.yml | 2 +- bats/helpers/callback.bash | 2 -- dev/Tiltfile | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bats.yml b/.github/workflows/bats.yml index bd736ddaf3..c1a5f648b8 100644 --- a/.github/workflows/bats.yml +++ b/.github/workflows/bats.yml @@ -21,7 +21,7 @@ jobs: //core/api-keys //apps/dashboard //apps/consent //apps/pay - name: Run bats tests run: | - nix develop -c bats --setup-suite-file bats/ci_setup_suite.bash -t bats/core/** + . ./.env && nix develop -c bats --setup-suite-file bats/ci_setup_suite.bash -t bats/core/** - name: Rename Tilt log if: always() run: mv bats/.e2e-tilt.log bats/e2e-tilt.log diff --git a/bats/helpers/callback.bash b/bats/helpers/callback.bash index d524c261a0..1eb6e89b94 100644 --- a/bats/helpers/callback.bash +++ b/bats/helpers/callback.bash @@ -1,8 +1,6 @@ CURRENT_FILE=${BASH_SOURCE:-bats/helpers/.} source "$(dirname "$CURRENT_FILE")/_common.bash" -SVIX_CALLBACK_URL=${SVIX_CALLBACK_URL:-"http://bats-tests:8080/webhook/"} - add_callback() { local token_name=$1 diff --git a/dev/Tiltfile b/dev/Tiltfile index 50dd89037b..9dc63a3c01 100644 --- a/dev/Tiltfile +++ b/dev/Tiltfile @@ -234,6 +234,7 @@ core_serve_env = { "LND1_TYPE": "offchain,onchain", "SVIX_SECRET": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE2OTE2NzIwMTQsImV4cCI6MjAwNzAzMjAxNCwibmJmIjoxNjkxNjcyMDE0LCJpc3MiOiJzdml4LXNlcnZlciIsInN1YiI6Im9yZ18yM3JiOFlkR3FNVDBxSXpwZ0d3ZFhmSGlyTXUifQ.b9s0aWSisNdUNki4edabBEToLNSwjC9-AiJQr4J3y4E", "SVIX_ENDPOINT": "http://localhost:8071", + "SVIX_CALLBACK_URL": "http://bats-tests:8080/webhook/", "EXPORTER_PORT": "3003" }