#25: Updateed script-languages-container-ci

exasol · Jun 14, 2022 · 0973811 · 0973811
1 parent bc75340
commit 0973811
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 30 deletions.
diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md
@@ -1,5 +1,6 @@
 # Changes
 
+* [0.5.0](changes_0.5.0.md)
 * [0.4.0](changes_0.4.0.md)
 * [0.3.0](changes_0.3.0.md)
 * [0.2.0](changes_0.2.0.md)

diff --git a/doc/changes/changes_0.5.0.md b/doc/changes/changes_0.5.0.md
@@ -0,0 +1,23 @@
+# script-languages-container-ci-setup 0.5.0, released 2022-06-15
+
+Code name: Update script-languages-container-ci 0.4.0
+
+## Summary
+
+This releases updates to Update script-languages-container-ci 0.4.0.
+
+## Bug Fixes
+
+ - #25: Updateed script-languages-container-ci
+
+## Features / Enhancements
+
+n/a
+
+## Documentation
+
+n/a
+
+## Refactoring
+
+n/a
diff --git a/exasol_script_languages_container_ci_setup/templates/config_schema.json b/exasol_script_languages_container_ci_setup/templates/config_schema.json
@@ -1,6 +1,6 @@
 {
   "type" : "object",
-  "required": [ "build_ignore" ],
+  "required": [ "build_ignore", "base_branch" ],
   "additionalProperties" : false,
   "properties" : {
     "build_ignore": {
@@ -10,6 +10,9 @@
       "properties" : {
         "ignored_paths" : { "type" : "array"}
       }
+    },
+    "base_branch": {
+      "type" : "string"
     }
   }
 }
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -15,7 +15,7 @@ click = "^8.1.3"
 jinja2 = ">=3.1.0"
 exasol_error_reporting_python = { git = "https://github.com/exasol/error-reporting-python.git", branch = "0.2.0" }
 exasol_script_languages_container_tool = { url = "https://github.com/exasol/script-languages-container-tool/releases/download/0.14.0/exasol_script_languages_container_tool-0.14.0-py3-none-any.whl" }
-exasol-script-languages-container-ci = {url = "https://github.com/exasol/script-languages-container-ci/releases/download/0.3.0/exasol_script_languages_container_ci-0.3.0-py3-none-any.whl"}
+exasol-script-languages-container-ci = {url = "https://github.com/exasol/script-languages-container-ci/releases/download/0.4.0/exasol_script_languages_container_ci-0.4.0-py3-none-any.whl"}
 
 boto3 = "^1.22.0"
 jsonschema = "^3.2.0"

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
  'boto3>=1.22.0,<2.0.0',
  'click>=8.1.3,<9.0.0',
  'exasol-script-languages-container-ci @ '
- 'https://github.com/exasol/script-languages-container-ci/releases/download/0.3.0/exasol_script_languages_container_ci-0.3.0-py3-none-any.whl',
+ 'https://github.com/exasol/script-languages-container-ci/releases/download/0.4.0/exasol_script_languages_container_ci-0.4.0-py3-none-any.whl',
  'exasol_error_reporting_python @ '
  'git+https://github.com/exasol/error-reporting-python.git@0.2.0',
  'exasol_script_languages_container_tool @ '

diff --git a/test/test_generate_buildspec.py b/test/test_generate_buildspec.py
@@ -90,7 +90,7 @@ def test_buildspec_with_valid_config_file(tmp_path):
     a_folder.mkdir(parents=False, exist_ok=False)
 
     config_file_path = tmp_path / "build_config.json"
-    config = {"build_ignore": {"ignored_paths": [str(a_folder)]}}
+    config = {"build_ignore": {"ignored_paths": [str(a_folder)]}, "base_branch": "master"}
     with open(config_file_path, "w") as f:
         json.dump(config, f)
 
@@ -124,7 +124,7 @@ def test_buildspec_with_invalid_config_file(tmp_path):
 
     config_file_path = tmp_path / "build_config.json"
     # Incorrect config ('ignored_path' instead of 'ignored_paths')
-    config = {"build_ignore": {"ignored_path": ["a_folder"]}}
+    config = {"build_ignore": {"ignored_path": ["a_folder"]}, "base_branch": "master"}
     with open(config_file_path, "w") as f:
         json.dump(config, f)
 
@@ -148,7 +148,7 @@ def test_buildspec_with_invalid_folder(tmp_path):
 
     a_folder = tmp_path / "a_folder"
     # Incorrect config (tmp_path/a_folder does not exists)
-    config = {"build_ignore": {"ignored_paths": [str(a_folder)]}}
+    config = {"build_ignore": {"ignored_paths": [str(a_folder)]}, "base_branch": "master"}
     with open(config_file_path, "w") as f:
         json.dump(config, f)