From f83608931bdc26dd1bf5da9b6accfc990e171cf9 Mon Sep 17 00:00:00 2001 From: sreepuramsudheer Date: Thu, 16 Jan 2025 12:22:25 +0530 Subject: [PATCH] Changes for notifications-service LTS upgrade. Signed-off-by: sreepuramsudheer --- .license_scout.yml | 4 ++++ components/notifications-service/habitat/plan.sh | 12 +++++++----- components/notifications-service/server/mix.lock | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.license_scout.yml b/.license_scout.yml index 2e6c6d2adad..cd5358ef07b 100644 --- a/.license_scout.yml +++ b/.license_scout.yml @@ -1563,6 +1563,10 @@ exceptions: reason: Exception made by Chef Legal - name: core/ruby3_1 reason: Ruby license (previously shipped in Automate 1) + - name: core/libmpc + reason: Exception made for notefications-service upgrade + - name: core/tzdata + reason: Added to supress license_scout error in verify_private ruby: - name: highline diff --git a/components/notifications-service/habitat/plan.sh b/components/notifications-service/habitat/plan.sh index 6330d6aee35..3040eb47584 100644 --- a/components/notifications-service/habitat/plan.sh +++ b/components/notifications-service/habitat/plan.sh @@ -1,5 +1,3 @@ -#stable channel - pkg_repo=a2 pkg_name=notifications-service @@ -19,21 +17,23 @@ pkg_deps=( ) pkg_build_deps=( core/git/2.33.1/20240614092831 + core/git + core/cacerts # Node(kallol) 2022-01-28: # # We have seen failures with notification service http request # with external services. This is because the erlang version was bumped to # v23.2. Hence pinning the version till we have a fix. - core/erlang25/25.0.4/20240108042737 + core/erlang26/26.2.2/20241017154809 # NOTE(ssd) 2019-07-03: PIN PIN PIN # # elixir 1.9.0 shipped with a number of changes to how releases # work. This appears to have broken the build. Pinning until we can # sort out the required changes. - core/elixir/1.14.0/20240108043326 - core/glibc/2.35/20240105171810 + core/elixir/1.17.3/20241204123504 + core/glibc ) pkg_binds=( @@ -82,6 +82,8 @@ do_prepare() { export MIX_HOME="${CACHE_PATH}/.mix" export HEX_HOME="${CACHE_PATH}/.hex" + mkdir -p "/etc/ssl/certs" + cp $(hab pkg path core/cacerts)/ssl/certs/cacert.pem "/etc/ssl/certs/ca-certificates.crt" mix local.hex --force mix local.rebar --force fix_interpreter "${MIX_HOME}/*" core/coreutils bin/env diff --git a/components/notifications-service/server/mix.lock b/components/notifications-service/server/mix.lock index bbbe6ea0dec..02a55e27e30 100644 --- a/components/notifications-service/server/mix.lock +++ b/components/notifications-service/server/mix.lock @@ -39,7 +39,7 @@ "protobuf": {:git, "https://github.com/tony612/protobuf-elixir.git", "9801e93497dc1b980db693765e4782355e63fd9f", [branch: "main"]}, "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"}, "sqerl": {:git, "https://github.com/chef/sqerl.git", "ebbe4c20ab5cd21041229d22dd60a6b38aa2930c", []}, - "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"}, + "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"}, "temp": {:hex, :temp, "0.4.7", "2c78482cc2294020a4bc0c95950b907ff386523367d4e63308a252feffbea9f2", [:mix], [], "hexpm", "6af19e7d6a85a427478be1021574d1ae2a1e1b90882586f06bde76c63cd03e0d"}, "timex": {:hex, :timex, "3.7.9", "790cdfc4acfce434e442f98c02ea6d84d0239073bfd668968f82ac63e9a6788d", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.10", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "64691582e5bb87130f721fc709acfb70f24405833998fabf35be968984860ce1"}, "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"},