From 4e9a036881845203a26b223ef5a54f0f8e6e43e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Bari=C5=A1i=C4=87?= <48765171+MarkoBarisic@users.noreply.github.com> Date: Wed, 8 Nov 2023 13:09:02 +0100 Subject: [PATCH] Fix v2.12 release pipeline (#1445) --- environment/os/amzn-2.sh | 11 ++--------- release/package/run.sh | 4 ++++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/environment/os/amzn-2.sh b/environment/os/amzn-2.sh index dc0467bc3..15ff29106 100755 --- a/environment/os/amzn-2.sh +++ b/environment/os/amzn-2.sh @@ -158,9 +158,9 @@ install() { continue fi if [ "$pkg" == nodejs ]; then - curl -sL https://rpm.nodesource.com/setup_16.x | bash - if ! yum list installed nodejs >/dev/null 2>/dev/null; then - yum install -y nodejs + yum install https://rpm.nodesource.com/pub_16.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm -y + yum install nodejs -y --setopt=nodesource-nodejs.module_hotfixes=1 fi continue fi @@ -172,13 +172,6 @@ install() { fi continue fi - if [ "$pkg" == nodejs ]; then - curl -sL https://rpm.nodesource.com/setup_16.x | bash - - if ! yum list installed nodejs >/dev/null 2>/dev/null; then - yum install -y nodejs - fi - continue - fi if [ "$pkg" == java-11-openjdk ]; then amazon-linux-extras install -y java-openjdk11 continue diff --git a/release/package/run.sh b/release/package/run.sh index 41231c398..bbd5ff48a 100755 --- a/release/package/run.sh +++ b/release/package/run.sh @@ -72,6 +72,10 @@ make_package () { if [[ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]]; then git fetch origin master:master fi + + # Ensure we have a clean build directory + docker exec "$build_container" rm -rf /memgraph + docker exec "$build_container" mkdir -p /memgraph # TODO(gitbuda): Revisit copying the whole repo -> makese sense under CI. docker cp "$PROJECT_ROOT/." "$build_container:/memgraph/"