update ci

daninsky1 · Dec 27, 2023 · 0b9fd9a · 0b9fd9a
1 parent 55fa99e
commit 0b9fd9a
Show file tree

Hide file tree

Showing 4 changed files with 126 additions and 76 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,16 +14,9 @@ jobs:
       - checkout
       - run:
           name: Check Node installation
-          environment:
-            NODE_MAJOR: 20
           command: |
-            apt-get update
-            apt-get install -y ca-certificates curl gnupg
-            apt install nodejs -y
-            curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-            echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODE_MAJOR}.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-            apt-get update
-            apt-get install nodejs -y      
+            bash ./scripts/deb/setup_lts.x
+            apt-get install nodejs -y
       - run: *envinfo
   debian-test:
     working_directory: ~/repo
@@ -33,16 +26,9 @@ jobs:
       - checkout
       - run:
           name: Check Node installation
-          environment:
-            NODE_MAJOR: 20
           command: |
-            apt-get update
-            apt-get install -y ca-certificates curl gnupg
-            apt install nodejs -y
-            curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-            echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODE_MAJOR}.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-            apt-get update
-            apt-get install nodejs -y      
+            bash ./scripts/deb/setup_lts.x
+            apt-get install nodejs -y
       - run: *envinfo
   amazonlinux-test:
     working_directory: ~/repo
@@ -55,8 +41,8 @@ jobs:
           environment:
             NODE_MAJOR: 20
           command: |
-            yum install https://rpm.nodesource.com/pub_${NODE_MAJOR}.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm -y
-            yum install nodejs -y --setopt=nodesource-nodejs.module_hotfixes=1
+            bash ./scripts/rpm/setup_lts.x
+            yum install nodejs -y
       - run: *envinfo
   fedora-test:
     working_directory: ~/repo
@@ -66,11 +52,9 @@ jobs:
       - checkout
       - run:
           name: Check Node installation
-          environment:
-            NODE_MAJOR: 20
           command: |
-            yum install https://rpm.nodesource.com/pub_${NODE_MAJOR}.x/nodistro/repo/nodesource-release-nodistro-1.noarch.rpm -y
-            yum install nodejs -y --setopt=nodesource-nodejs.module_hotfixes=1
+            bash ./scripts/rpm/setup_lts.x
+            yum install nodejs -y
       - run: *envinfo
 
 workflows:

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -22,16 +22,11 @@ jobs:
       run:
         shell: bash
     steps:
-      - name: Update and Install Dependencies
-        run: |
-          apt-get update -y
-          apt-get install curl git -y
-
       - name: Checkout Repo
         uses: actions/checkout@v4
 
       - name: Run Istallation Script
-        run: ./scripts/deb/nsolid_setup_deb.sh ${{ matrix.version }}
+        run: ./scripts/rpm/setup_${{ matrix.version }}.x
 
       - name: Install Nodejs
         run: |
@@ -59,11 +54,6 @@ jobs:
       run:
         shell: bash
     steps:
-      - name: Update and Install Dependencies
-        run: |
-          yum update -y
-          yum install git -y
-
       - name: Checkout Repo
         uses: actions/checkout@v4
 

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,7 +1,7 @@
 The MIT License (MIT)
 =====================
 
-Copyright (c) 2019 NodeSource LLC
+Copyright (c) 2024 NodeSource LLC
 ---------------------------------
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

diff --git a/README.md b/README.md
@@ -80,46 +80,84 @@ NodeSource will continue to maintain the following architectures and may add add
 
 #### Node.js
 
-> _If you have root access, you can omit the 'sudo' command as you already have full administrative privileges._
+**Node.js v21.x**:
 
-#### Node.js v21.x
+##### Using Ubuntu
 
 ```sh
-sudo apt-get update && sudo apt-get install curl -y
-curl -fsSL https://deb.nodesource.com/setup_21.x | sudo bash -
-sudo apt-get install nodejs -y
+curl -fsSL https://deb.nodesource.com/setup_21.x | sudo -E bash - &&\
+sudo apt-get install -y nodejs
 ```
 
-#### Node.js v20.x
+##### Using Debian, as root
 
 ```sh
-sudo apt-get update && sudo apt-get install curl -y
-curl -fsSL https://deb.nodesource.com/setup_20.x | sudo bash -
-sudo apt-get install nodejs -y
+curl -fsSL https://deb.nodesource.com/setup_21.x | bash - &&\
+apt-get install -y nodejs
 ```
 
-#### Node.js v18.x
+**Node.js v20.x**:
+
+##### Using Ubuntu
 
 ```sh
-sudo apt-get update && sudo apt-get install curl -y
-curl -fsSL https://deb.nodesource.com/setup_18.x | sudo bash -
-sudo apt-get install nodejs -y
+curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash - &&\
+sudo apt-get install -y nodejs
 ```
 
-#### Node.js Current (v21.x)
+##### Using Debian, as root
 
 ```sh
-sudo apt-get update && sudo apt-get install curl -y
-curl -fsSL https://deb.nodesource.com/setup_current.x | sudo bash -
-sudo apt-get install nodejs -y
+curl -fsSL https://deb.nodesource.com/setup_20.x | bash - &&\
+apt-get install -y nodejs
 ```
 
-#### Node.js LTS (v20.x)
+**Node.js v18.x**:
+
+##### Using Ubuntu
 
 ```sh
-sudo apt-get update && sudo apt-get install curl -y
-curl -fsSL https://deb.nodesource.com/setup_lts.x | sudo bash -
-sudo apt-get install nodejs -y
+curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - &&\
+sudo apt-get install -y nodejs
+```
+
+##### Using Debian, as root
+
+```sh
+curl -fsSL https://deb.nodesource.com/setup_18.x | bash - &&\
+apt-get install -y nodejs
+```
+
+**Node.js LTS (v20.x)**:
+
+##### Using Ubuntu
+
+```sh
+curl -fsSL https://deb.nodesource.com/setup_lts.x | sudo -E bash - &&\
+sudo apt-get install -y nodejs
+```
+
+##### Using Debian, as root
+
+```sh
+curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - &&\
+apt-get install -y nodejs
+```
+
+**Node.js Current (v21.x)**:
+
+##### Using Ubuntu
+
+```sh
+curl -fsSL https://deb.nodesource.com/setup_current.x | sudo -E bash - &&\
+sudo apt-get install -y nodejs
+```
+
+##### Using Debian, as root
+
+```sh
+curl -fsSL https://deb.nodesource.com/setup_current.x | bash - &&\
+apt-get install -y nodejs
 ```
 
 ### Uninstall `nodejs` Ubuntu & Debian packages
@@ -174,46 +212,84 @@ NodeSource will continue to maintain the following architectures and may add add
 
 The Nodesource RPM package signing key is available here: <https://rpm.nodesource.com/gpgkey/nodesource.gpg.key>
 
-> _If you have root access, you can omit the 'sudo' command as you already have full administrative privileges._
+**Node.js v21.x**
+
+##### As root
 
-#### Node.js v21.x
+```sh
+curl -fsSL https://rpm.nodesource.com/setup_21.x | bash -
+yum install -y nodejs
+```
+
+##### No root privileges
 
 ```sh
-sudo yum update -y && sudo yum install curl -y
 curl -fsSL https://rpm.nodesource.com/setup_21.x | sudo bash -
-sudo yum install nodejs -y
+yum install -y nodejs
 ```
 
-#### Node.js v20.x
+**Node.js v20.x**
+
+##### As root
+
+```sh
+curl -fsSL https://rpm.nodesource.com/setup_20.x | bash -
+yum install -y nodejs
+```
+
+##### No root privileges
 
 ```sh
-sudo yum update -y && sudo yum install curl -y
 curl -fsSL https://rpm.nodesource.com/setup_20.x | sudo bash -
-sudo yum install nodejs -y
+yum install -y nodejs
+```
+
+**Node.js v18.x**
+
+##### As root
+
+```sh
+curl -fsSL https://rpm.nodesource.com/setup_18.x | bash -
+yum install -y nodejs
 ```
 
-#### Node.js v18.x
+##### No root privileges
 
 ```sh
-sudo yum update -y && sudo yum install curl -y
 curl -fsSL https://rpm.nodesource.com/setup_18.x | sudo bash -
-sudo yum install nodejs -y
+yum install -y nodejs
 ```
 
-#### Node.js Current (v21.x)
+**Node.js LTS (20.x)**
+
+##### As root
 
 ```sh
-sudo yum update -y && sudo yum install curl -y
-curl -fsSL https://rpm.nodesource.com/setup_current.x | sudo bash -
-sudo yum install nodejs -y
+curl -fsSL https://rpm.nodesource.com/setup_lts.x | bash -
+yum install -y nodejs
 ```
 
-#### Node.js LTS (v20.x)
+##### No root privileges
 
 ```sh
-sudo yum update -y && sudo yum install curl -y
 curl -fsSL https://rpm.nodesource.com/setup_lts.x | sudo bash -
-sudo yum install nodejs -y
+yum install -y nodejs
+```
+
+**Node.js Current (21.x)**
+
+##### As root
+
+```sh
+curl -fsSL https://rpm.nodesource.com/setup_current.x | bash -
+yum install -y nodejs
+```
+
+##### No root privileges
+
+```sh
+curl -fsSL https://rpm.nodesource.com/setup_current.x | sudo bash -
+yum install -y nodejs
 ```
 
 ***Optional***: install build tools
@@ -330,6 +406,6 @@ This material is Copyright (c) NodeSource and licensed under the MIT license. Al
 
 *Red Hat, CentOS and Fedora are trademarks of Red Hat, Inc.*
 
-*Amazon Linux are trademarks of Amazon Web Services, Inc*
+*Amazon Linux is a trademark of Amazon Web Services, Inc.*
 
-*CloudLinux is a trademark of Cloud Linux, Inc*
+*CloudLinux is a trademark of CloudLinux, Inc*