Skip to content
Merged
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ jobs:
},
};

const defaultLinterVariables = {
KUBERNETES_KUBECONFORM_OPTIONS:
"-schema-location default -schema-location https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/{{.Group}}/{{.ResourceKind}}_{{.ResourceAPIVersion}}.json",
};

function parseEnvironmentLines(serializedEnvironment) {
const environment = new Map();

Expand Down Expand Up @@ -156,7 +161,10 @@ jobs:
}

const customEnvironment = parseEnvironmentLines(process.env.LINTER_ENV ?? "");
const defaultEnvironment = getToolchainEnvironment(process.env.LINTER_TOOLCHAIN);
const defaultEnvironment = {
...defaultLinterVariables,
...getToolchainEnvironment(process.env.LINTER_TOOLCHAIN),
};
const mergedEnvironment = mergeEnvironment(customEnvironment, defaultEnvironment);

for (const [key, value] of mergedEnvironment) {
Expand Down
Loading