From 88a536f3ebd832c9afbec234d22d4d3ebb2838ec Mon Sep 17 00:00:00 2001 From: Ken Sedgwick Date: Wed, 1 Nov 2023 18:00:29 -0700 Subject: [PATCH] Possible fix for CI_SERVER issue in VLS CI Code using `CI_SERVER` was added recently to track something. It attempts to short-cut if `CI_SERVER` is not set, but on gitlab it is set to `yes`. https://docs.gitlab.com/ee/ci/variables/ Instead use `CI_SERVER_URL`, maybe that is what is intended? --- .github/workflows/ci.yaml | 2 +- conftest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 70abe73b9..784a4a58c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,7 +15,7 @@ env: # of a bit of compile time. RUST_PROFILE: release SLOW_MACHINE: 1 - CI_SERVER: "http://35.239.136.52:3170" + CI_SERVER_URL: "http://35.239.136.52:3170" jobs: prebuild: diff --git a/conftest.py b/conftest.py index 5f7b8c9c1..c88f4ae2b 100644 --- a/conftest.py +++ b/conftest.py @@ -6,7 +6,7 @@ import json from time import time import unittest -server = os.environ.get("CI_SERVER", None) +server = os.environ.get("CI_SERVER_URL", None) github_sha = ( subprocess.check_output(["git", "rev-parse", "HEAD"]).decode("ASCII").strip()