From 50c9ec1be165d8a3f21dd6c8366c773e518c3bef Mon Sep 17 00:00:00 2001 From: Max Moiseev Date: Thu, 29 Feb 2024 17:26:35 -0800 Subject: [PATCH] CI: Set environment for SVR3 integration tests in Slow Tests --- .editorconfig | 4 ++++ .github/workflows/slow_tests.yml | 3 +++ java/Makefile | 10 ++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index 6a21d12c..ae4f715b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -37,3 +37,7 @@ indent_size = 4 [*.swift] indent_size = 4 + +[Makefile] +indent_style = tab +indent_size = 4 diff --git a/.github/workflows/slow_tests.yml b/.github/workflows/slow_tests.yml index cc7a2557..c23bfd6b 100644 --- a/.github/workflows/slow_tests.yml +++ b/.github/workflows/slow_tests.yml @@ -1,5 +1,8 @@ name: Slow Tests +env: + ENCLAVE_SECRET: ${{secrets.SVR_ENCLAVE_SECRET}} + on: schedule: # "High load times include the start of every hour. diff --git a/java/Makefile b/java/Makefile index 9c54b207..7375b7f1 100644 --- a/java/Makefile +++ b/java/Makefile @@ -18,13 +18,15 @@ docker_image: java_build: DOCKER_EXTRA=$(shell [ -L build ] && P=$$(readlink build) && echo -v $$P/:$$P ) java_build: docker_image $(DOCKER) run $(DOCKER_TTY_FLAG) --init --rm --user $$(id -u):$$(id -g) \ - -v `cd .. && pwd`/:/home/libsignal/src $(DOCKER_EXTRA) $(DOCKER_IMAGE) \ - sh -c "cd src/java; ./gradlew build" + --env ENCLAVE_SECRET \ + -v `cd .. && pwd`/:/home/libsignal/src $(DOCKER_EXTRA) $(DOCKER_IMAGE) \ + sh -c "cd src/java; ./gradlew build" java_test: java_build $(DOCKER) run $(DOCKER_TTY_FLAG) --init --rm --user $$(id -u):$$(id -g) \ - -v `cd .. && pwd`/:/home/libsignal/src $(DOCKER_EXTRA) $(DOCKER_IMAGE) \ - sh -c "cd src/java; ./gradlew test" + --env ENCLAVE_SECRET \ + -v `cd .. && pwd`/:/home/libsignal/src $(DOCKER_EXTRA) $(DOCKER_IMAGE) \ + sh -c "cd src/java; ./gradlew test" publish_java: DOCKER_EXTRA = $(shell [ -L build ] && P=$$(readlink build) && echo -v $$P/:$$P ) publish_java: docker_image