Merge pull request #1022 from exasol/develop

Changelog: - Implement a GH workflow(s) which validates correct target branch of PR (#1017) - #1019: Update Dependencies on top of 8.3.0 (#1020)
exasol · Nov 21, 2024 · c1a247e · c1a247e
2 parents f2edb41 + 0f1abd1
commit c1a247e
Show file tree

Hide file tree

Showing 21 changed files with 37 additions and 23 deletions.
diff --git a/.current_gitmodules b/.current_gitmodules
diff --git a/.github/workflows/validate_pr.yaml b/.github/workflows/validate_pr.yaml
@@ -0,0 +1,12 @@
+name: Validate PR
+
+on:
+  pull_request:
+
+jobs:
+  validate-pr:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Check master
+        if: ${{github.base_ref == 'master' && github.ref_name != 'develop'}}
+        run: echo You must not merge directly to master. Instead merge to 'develop' first. && exit 1
diff --git a/doc/changes/changes_9.0.0.md b/doc/changes/changes_9.0.0.md
@@ -18,7 +18,8 @@ This release uses version 1.0.0 of the container tool.
 ## Security Issues
 
  - #956: Updated dependencies
- - #1006: Updated Dependencies on top of 8.4.0 
+ - #1006: Updated Dependencies on top of 8.3.0
+ - #1019: Update Dependencies on top of 8.3.0 
 
 ## Refactorings
 
@@ -46,6 +47,7 @@ This release uses version 1.0.0 of the container tool.
   - #1002: Use ECR fallback repository for Trivy caching
   - #958: Fix conda version conflict
   - #1014: Fixed Push Docker Test Container workflow
+  - #1017: Implemented a GH workflow which validates correct target branch of PR
 
 ## Doc
 

diff --git a/...ges/package_diffs/9.0.0/standard-EXASOL-all/build_deps/apt_get_packages_diff.md b/...ges/package_diffs/9.0.0/standard-EXASOL-all/build_deps/apt_get_packages_diff.md
diff --git a/...e_diffs/9.0.0/standard-EXASOL-all/flavor_base_deps_apt/apt_get_packages_diff.md b/...e_diffs/9.0.0/standard-EXASOL-all/flavor_base_deps_apt/apt_get_packages_diff.md
diff --git a/.../package_diffs/9.0.0/standard-EXASOL-all/language_deps/apt_get_packages_diff.md b/.../package_diffs/9.0.0/standard-EXASOL-all/language_deps/apt_get_packages_diff.md
diff --git a/..._template-Exasol-all-python-3.10-cuda-conda/conda_deps/apt_get_packages_diff.md b/..._template-Exasol-all-python-3.10-cuda-conda/conda_deps/apt_get_packages_diff.md
diff --git a/...age_diffs/9.0.0/template-Exasol-all-java-17/build_deps/apt_get_packages_diff.md b/...age_diffs/9.0.0/template-Exasol-all-java-17/build_deps/apt_get_packages_diff.md
diff --git a/..._diffs/9.0.0/template-Exasol-all-java-17/language_deps/apt_get_packages_diff.md b/..._diffs/9.0.0/template-Exasol-all-java-17/language_deps/apt_get_packages_diff.md
diff --git a/...9.0.0/template-Exasol-all-python-3.10-conda/conda_deps/apt_get_packages_diff.md b/...9.0.0/template-Exasol-all-python-3.10-conda/conda_deps/apt_get_packages_diff.md
diff --git a/...diffs/9.0.0/template-Exasol-all-python-3.10/build_deps/apt_get_packages_diff.md b/...diffs/9.0.0/template-Exasol-all-python-3.10/build_deps/apt_get_packages_diff.md
diff --git a/...9.0.0/template-Exasol-all-python-3.10/flavor_base_deps/apt_get_packages_diff.md b/...9.0.0/template-Exasol-all-python-3.10/flavor_base_deps/apt_get_packages_diff.md
diff --git a/...fs/9.0.0/template-Exasol-all-python-3.10/language_deps/apt_get_packages_diff.md b/...fs/9.0.0/template-Exasol-all-python-3.10/language_deps/apt_get_packages_diff.md
diff --git a/...package_diffs/9.0.0/template-Exasol-all-r-4/build_deps/apt_get_packages_diff.md b/...package_diffs/9.0.0/template-Exasol-all-r-4/build_deps/apt_get_packages_diff.md
diff --git a/...kage_diffs/9.0.0/template-Exasol-all-r-4/language_deps/apt_get_packages_diff.md b/...kage_diffs/9.0.0/template-Exasol-all-r-4/language_deps/apt_get_packages_diff.md
diff --git a/flavors/standard-EXASOL-all/flavor_base/build_deps/packages/apt_get_packages b/flavors/standard-EXASOL-all/flavor_base/build_deps/packages/apt_get_packages
@@ -1,7 +1,7 @@
 coreutils|8.32-4.1ubuntu1.2
 locales|2.35-0ubuntu3.8
 tar|1.34+dfsg-1ubuntu0.1.22.04.2
-curl|7.81.0-1ubuntu1.18
+curl|7.81.0-1ubuntu1.19
 openjdk-11-jdk|11.0.25+9-1ubuntu1~22.04
 build-essential|12.9ubuntu3
 libpcre3-dev|2:8.39-13ubuntu0.22.04.1

diff --git a/flavors/standard-EXASOL-all/flavor_base/flavor_base_deps_apt/packages/apt_get_packages b/flavors/standard-EXASOL-all/flavor_base/flavor_base_deps_apt/packages/apt_get_packages
@@ -1,6 +1,6 @@
 unzip|6.0-26ubuntu3.2
 git|1:2.34.1-1ubuntu1.11
-libcurl4-openssl-dev|7.81.0-1ubuntu1.18
+libcurl4-openssl-dev|7.81.0-1ubuntu1.19
 build-essential|12.9ubuntu3
 wget|1.21.2-2ubuntu1.1
 maven|3.6.3-5

diff --git a/flavors/standard-EXASOL-all/flavor_base/language_deps/packages/apt_get_packages b/flavors/standard-EXASOL-all/flavor_base/language_deps/packages/apt_get_packages
@@ -1,6 +1,6 @@
 ca-certificates|20240203~22.04.1
-python3.10-dev|3.10.12-1~22.04.6
+python3.10-dev|3.10.12-1~22.04.7
 python3-distutils|3.10.8-1~22.04
-curl|7.81.0-1ubuntu1.18
+curl|7.81.0-1ubuntu1.19
 openjdk-11-jdk-headless|11.0.25+9-1ubuntu1~22.04
 chrpath|0.16-2
diff --git a/flavors/template-Exasol-all-r-4/flavor_base/build_deps/packages/apt_get_packages b/flavors/template-Exasol-all-r-4/flavor_base/build_deps/packages/apt_get_packages
@@ -1,7 +1,7 @@
 coreutils|8.32-4.1ubuntu1.2
 locales|2.35-0ubuntu3.8
 tar|1.34+dfsg-1ubuntu0.1.22.04.2
-curl|7.81.0-1ubuntu1.18
+curl|7.81.0-1ubuntu1.19
 openjdk-11-jdk|11.0.25+9-1ubuntu1~22.04
 build-essential|12.9ubuntu3
 libpcre3-dev|2:8.39-13ubuntu0.22.04.1

diff --git a/flavors/template-Exasol-all-r-4/flavor_base/language_deps/packages/apt_get_packages b/flavors/template-Exasol-all-r-4/flavor_base/language_deps/packages/apt_get_packages
@@ -1,2 +1,2 @@
 ca-certificates|20240203~22.04.1
-curl|7.81.0-1ubuntu1.18
+curl|7.81.0-1ubuntu1.19
diff --git a/script-languages b/script-languages
+375 −0		exaudfclient/docs/script_options_requirments.md
+1 −1		ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified
+1 −1		ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions
+1 −1		flavors/template-Exasol-8-python-3.10-cuda-conda/flavor_base/conda_deps/packages/apt_get_packages
+1 −1		flavors/template-Exasol-all-java-17/flavor_base/build_deps/packages/apt_get_packages
+1 −1		flavors/template-Exasol-all-java-17/flavor_base/language_deps/packages/apt_get_packages
+1 −1		flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages
+1 −1		flavors/template-Exasol-all-python-3.10/flavor_base/build_deps/packages/apt_get_packages
+1 −1		flavors/template-Exasol-all-python-3.10/flavor_base/flavor_base_deps/packages/apt_get_packages
+2 −2		flavors/template-Exasol-all-python-3.10/flavor_base/language_deps/packages/apt_get_packages