From 0f440c082b51d5223f4a90188b53b46d6aecbe56 Mon Sep 17 00:00:00 2001 From: Dan Vargas Date: Wed, 13 Oct 2021 16:23:49 -0500 Subject: [PATCH 1/2] fix pkg build action for when pkg files are deleted --- .github/workflows/package-pr.yaml | 2 +- .github/workflows/package-push.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package-pr.yaml b/.github/workflows/package-pr.yaml index 78101b0..8ac17a3 100644 --- a/.github/workflows/package-pr.yaml +++ b/.github/workflows/package-pr.yaml @@ -53,7 +53,7 @@ jobs: - name: Build Packages run: | - PACKAGES=$(jq '.[]' -r ${HOME}/files.json | awk -F/ '$2 && $3{ print $2 "-" $3 }' | sort -u) + PACKAGES=$(jq '.[]' -r ${HOME}/files*.json | awk -F/ '$1~/packages/ && $2 && $3{ print $2 "-" $3 }' | sort -u) echo "Packages: $PACKAGES" docker pull docker.pkg.github.com/engineer-man/piston/repo-builder:latest docker build -t repo-builder repo diff --git a/.github/workflows/package-push.yaml b/.github/workflows/package-push.yaml index ee49487..9de6051 100644 --- a/.github/workflows/package-push.yaml +++ b/.github/workflows/package-push.yaml @@ -30,7 +30,7 @@ jobs: - name: Build Packages run: | - PACKAGES=$(jq '.[]' -r ${HOME}/files.json | awk -F/ '{ print $2 "-" $3 }' | sort -u) + PACKAGES=$(jq '.[]' -r ${HOME}/files*.json | awk -F/ '$1~/packages/ && $2 && $3{ print $2 "-" $3 }' | sort -u) echo "Packages: $PACKAGES" docker pull docker.pkg.github.com/engineer-man/piston/repo-builder:latest docker build -t repo-builder repo From 6ca9606f81d396e95dfd3a4a78520cf176d33682 Mon Sep 17 00:00:00 2001 From: Brikaa Date: Sat, 16 Oct 2021 11:01:17 +0200 Subject: [PATCH 2/2] Adhere to project let, const practices in my code --- api/src/api/v2.js | 10 +++++----- api/src/config.js | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/api/src/api/v2.js b/api/src/api/v2.js index d772c5a..c0526f4 100644 --- a/api/src/api/v2.js +++ b/api/src/api/v2.js @@ -106,11 +106,11 @@ function get_job(body) { }); } - for (let constraint of ['memory_limit', 'timeout']) { - for (let type of ['compile', 'run']) { - let constraint_name = `${type}_${constraint}`; - let constraint_value = body[constraint_name]; - let configured_limit = rt[`${constraint}s`][type]; + for (const constraint of ['memory_limit', 'timeout']) { + for (const type of ['compile', 'run']) { + const constraint_name = `${type}_${constraint}`; + const constraint_value = body[constraint_name]; + const configured_limit = rt[`${constraint}s`][type]; if (!constraint_value) { continue; } diff --git a/api/src/config.js b/api/src/config.js index 8d0020f..85aa691 100644 --- a/api/src/config.js +++ b/api/src/config.js @@ -11,8 +11,8 @@ function parse_overrides(overrides) { } function validate_overrides(overrides, options) { - for (let language in overrides) { - for (let key in overrides[language]) { + for (const language in overrides) { + for (const key in overrides[language]) { if ( ![ 'max_process_count', @@ -28,13 +28,13 @@ function validate_overrides(overrides, options) { logger.error(`Invalid overridden option: ${key}`); return false; } - let option = options.find(o => o.key === key); - let parser = option.parser; - let raw = overrides[language][key]; - let value = parser(raw); - let validators = option.validators; - for (let validator of validators) { - let response = validator(value, raw); + const option = options.find(o => o.key === key); + const parser = option.parser; + const raw = overrides[language][key]; + const value = parser(raw); + const validators = option.validators; + for (const validator of validators) { + const response = validator(value, raw); if (response !== true) { logger.error( `Failed to validate overridden option: ${key}`,