Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Follow-up fixes for #996 #1003

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+3 −9
Open

Follow-up fixes for #996 #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9141f5b
tests: utils: assert_directories_equal: Convert ignore_files to a tuple
eskultety May 28, 2024
a3540cf
workers: Drop explicit GOSUMDB=off setting occurrences
eskultety May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions cachito/web/static/api_v1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1219,9 +1219,6 @@ components:
GOPATH:
value: deps/gomod
kind: path
GOSUMDB:
value: off
kind: literal
GOTOOLCHAIN:
value: local
kind: literal
Expand Down
4 changes: 0 additions & 4 deletions cachito/workers/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ class Config(object):
cachito_archives_minimum_age_days = 365
cachito_auth_type: Optional[str] = None
cachito_default_environment_variables = {
"gomod": {
"GOSUMDB": {"value": "off", "kind": "literal"},
},
"npm": {
"CHROMEDRIVER_SKIP_DOWNLOAD": {"value": "true", "kind": "literal"},
"CYPRESS_INSTALL_BINARY": {"value": "0", "kind": "literal"},
Expand Down Expand Up @@ -162,7 +159,6 @@ class TestingConfig(DevelopmentConfig):
cachito_default_environment_variables = {
"gomod": {
"GO111MODULE": {"value": "on", "kind": "literal"},
"GOSUMDB": {"value": "off", "kind": "literal"},
},
"npm": {
"CHROMEDRIVER_SKIP_DOWNLOAD": {"value": "true", "kind": "literal"},
Expand Down
1 change: 1 addition & 0 deletions cachito/workers/pkg_managers/gomod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ def resolve_gomod(app_source_path, request, dep_replacements=None, git_dir_path=
"PATH": os.environ.get("PATH", ""),
"GOMODCACHE": "{}/pkg/mod".format(temp_dir),
"GOTOOLCHAIN": "auto",
"GOSUMDB": "sum.golang.org",
}
if "cgo-disable" in request.get("flags", []):
env["CGO_ENABLED"] = "0"
Expand Down
3 changes: 2 additions & 1 deletion tests/helper_utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
from typing import Union


def assert_directories_equal(dir_a, dir_b, ignore_files=[]):
def assert_directories_equal(dir_a, dir_b, ignore_files=()):
"""
Check recursively directories have equal content.

:param dir_a: first directory to check
:param dir_b: second directory to check
:param ignore_files: a sequence of file names to be ignored in the comparisons
"""
ignore_files = list(set(filecmp.DEFAULT_IGNORES).union(ignore_files))
dirs_cmp = filecmp.dircmp(dir_a, dir_b, ignore=ignore_files)
Expand Down
1 change: 0 additions & 1 deletion tests/test_workers/test_tasks/test_gomod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ def directory_present(*args, **kwargs):
# Add the default environment variables from the configuration
env_vars = {
"GO111MODULE": {"value": "on", "kind": "literal"},
"GOSUMDB": {"value": "off", "kind": "literal"},
}
sample_env_vars.update(env_vars)

Expand Down