From c99085c396bcd4b3754ab99d5380862ec5fdb8d6 Mon Sep 17 00:00:00 2001 From: Slava <20563034+veaceslavdoina@users.noreply.github.com> Date: Wed, 21 Feb 2024 22:50:57 +0200 Subject: [PATCH 1/2] Set environment variables from files in Docker (#717) Signed-off-by: Slava <20563034+veaceslavdoina@users.noreply.github.com> --- docker/docker-entrypoint.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index a67340a7..f315ddb7 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -1,5 +1,10 @@ #!/bin/bash +# Environment variables from files +if [[ -n "${ENV_PATH}" ]]; then + [[ -f ${ENV_PATH} ]] && source ${ENV_PATH} || for f in ${ENV_PATH}/*; do source $f; done +fi + # Parameters if [[ -z "${CODEX_NAT}" ]]; then if [[ "${NAT_IP_AUTO}" == "true" && -z "${NAT_PUBLIC_IP_AUTO}" ]]; then From 1eebaa4ce336c3dd00db97c2c2b5614665414dd7 Mon Sep 17 00:00:00 2001 From: Slava <20563034+veaceslavdoina@users.noreply.github.com> Date: Thu, 22 Feb 2024 00:10:37 +0200 Subject: [PATCH 2/2] ci: use latest amd64 macos runner (#718) Signed-off-by: Slava <20563034+veaceslavdoina@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 525450fc..fdf95ae3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: with: matrix: | os {linux}, cpu {amd64}, builder {ubuntu-latest}, tests {all}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} - os {macos}, cpu {amd64}, builder {macos-latest}, tests {all}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} + os {macos}, cpu {amd64}, builder {macos-13}, tests {all}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} os {windows}, cpu {amd64}, builder {windows-latest}, tests {unittest}, nim_version {${{ env.nim_version }}}, shell {msys2} os {windows}, cpu {amd64}, builder {windows-latest}, tests {contract}, nim_version {${{ env.nim_version }}}, shell {msys2} os {windows}, cpu {amd64}, builder {windows-latest}, tests {integration}, nim_version {${{ env.nim_version }}}, shell {msys2}