From d854dd5c81f391e7aca6f49c379ef953999c7b50 Mon Sep 17 00:00:00 2001 From: Ian Date: Mon, 30 Oct 2023 15:44:46 -0400 Subject: [PATCH 1/2] Update fixturenet-laconicd.yml --- .github/workflows/fixturenet-laconicd.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/fixturenet-laconicd.yml b/.github/workflows/fixturenet-laconicd.yml index 5c712e9b..a16c1fe6 100644 --- a/.github/workflows/fixturenet-laconicd.yml +++ b/.github/workflows/fixturenet-laconicd.yml @@ -12,12 +12,6 @@ jobs: name: "Run fixturenet-laconicd test suite" runs-on: ubuntu-latest steps: - - name: 'Setup jq' - run: apt-get install jq -y - - name: 'Check jq' - run: | - which jq - jq --version - name: "Clone project repository" uses: actions/checkout@v3 - name: "Install Python" -- 2.45.2 From a27928e9759dabb046f353208aafc6b0110e47ec Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Mon, 30 Oct 2023 16:21:10 -0500 Subject: [PATCH 2/2] Fix KeyError accessing config. --- app/deploy/deployment_create.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/deploy/deployment_create.py b/app/deploy/deployment_create.py index a7cbe57e..04fdde4a 100644 --- a/app/deploy/deployment_create.py +++ b/app/deploy/deployment_create.py @@ -261,7 +261,7 @@ def init(ctx, config, output, map_ports_to_host): config_variables = _parse_config_variables(config) if config_variables: # Implement merge, since update() overwrites - orig_config = spec_file_content["config"] + orig_config = spec_file_content.get("config", {}) new_config = config_variables["config"] merged_config = {**new_config, **orig_config} spec_file_content.update({"config": merged_config}) -- 2.45.2