Compare commits

..

No commits in common. "f9aac547354aee507c7fdb09ba697afe1e0fe485" and "4483cdbe3e3b3ae80f2dcad27efe4aa903958513" have entirely different histories.

4 changed files with 16 additions and 16 deletions

View File

@ -53,7 +53,7 @@ jobs:
- name: Build Packages - name: Build Packages
run: | run: |
PACKAGES=$(jq '.[]' -r ${HOME}/files*.json | awk -F/ '$1~/packages/ && $2 && $3{ print $2 "-" $3 }' | sort -u) PACKAGES=$(jq '.[]' -r ${HOME}/files.json | awk -F/ '$2 && $3{ print $2 "-" $3 }' | sort -u)
echo "Packages: $PACKAGES" echo "Packages: $PACKAGES"
docker pull docker.pkg.github.com/engineer-man/piston/repo-builder:latest docker pull docker.pkg.github.com/engineer-man/piston/repo-builder:latest
docker build -t repo-builder repo docker build -t repo-builder repo

View File

@ -30,7 +30,7 @@ jobs:
- name: Build Packages - name: Build Packages
run: | run: |
PACKAGES=$(jq '.[]' -r ${HOME}/files*.json | awk -F/ '$1~/packages/ && $2 && $3{ print $2 "-" $3 }' | sort -u) PACKAGES=$(jq '.[]' -r ${HOME}/files.json | awk -F/ '{ print $2 "-" $3 }' | sort -u)
echo "Packages: $PACKAGES" echo "Packages: $PACKAGES"
docker pull docker.pkg.github.com/engineer-man/piston/repo-builder:latest docker pull docker.pkg.github.com/engineer-man/piston/repo-builder:latest
docker build -t repo-builder repo docker build -t repo-builder repo

View File

@ -106,11 +106,11 @@ function get_job(body) {
}); });
} }
for (const constraint of ['memory_limit', 'timeout']) { for (let constraint of ['memory_limit', 'timeout']) {
for (const type of ['compile', 'run']) { for (let type of ['compile', 'run']) {
const constraint_name = `${type}_${constraint}`; let constraint_name = `${type}_${constraint}`;
const constraint_value = body[constraint_name]; let constraint_value = body[constraint_name];
const configured_limit = rt[`${constraint}s`][type]; let configured_limit = rt[`${constraint}s`][type];
if (!constraint_value) { if (!constraint_value) {
continue; continue;
} }

View File

@ -11,8 +11,8 @@ function parse_overrides(overrides) {
} }
function validate_overrides(overrides, options) { function validate_overrides(overrides, options) {
for (const language in overrides) { for (let language in overrides) {
for (const key in overrides[language]) { for (let key in overrides[language]) {
if ( if (
![ ![
'max_process_count', 'max_process_count',
@ -28,13 +28,13 @@ function validate_overrides(overrides, options) {
logger.error(`Invalid overridden option: ${key}`); logger.error(`Invalid overridden option: ${key}`);
return false; return false;
} }
const option = options.find(o => o.key === key); let option = options.find(o => o.key === key);
const parser = option.parser; let parser = option.parser;
const raw = overrides[language][key]; let raw = overrides[language][key];
const value = parser(raw); let value = parser(raw);
const validators = option.validators; let validators = option.validators;
for (const validator of validators) { for (let validator of validators) {
const response = validator(value, raw); let response = validator(value, raw);
if (response !== true) { if (response !== true) {
logger.error( logger.error(
`Failed to validate overridden option: ${key}`, `Failed to validate overridden option: ${key}`,