From 22ed86cf15921a6c5fb6588050f1e6ad8b9f4477 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Thu, 3 Oct 2024 15:33:28 -0700 Subject: [PATCH 01/17] add packaging for AL2 Adds packaging for amazonlinux 2 --- .github/workflows/package-rpm.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index f84e101a..bc05a01f 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -44,6 +44,9 @@ jobs: matrix: # minimum kernel version is 5.5 include: + - { distro: amazonlinux, version: 2, arch: x86_64 } + - { distro: amazonlinux, version: 2, arch: arm64 } + - { distro: rockylinux, version: 9, arch: x86_64 } - { distro: rockylinux, version: 9, arch: arm64 } From 3a60228b3ab8dfdc266500a507b1eb161f27e312 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Thu, 3 Oct 2024 15:36:21 -0700 Subject: [PATCH 02/17] use v3 checkout --- .github/workflows/package-rpm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index bc05a01f..f5a2f6ac 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -52,7 +52,7 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: install rust run: | From cc692013dce45bb4d52a5d22e14c693f9c05e9ed Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Thu, 3 Oct 2024 15:40:30 -0700 Subject: [PATCH 03/17] install node --- .github/workflows/package-rpm.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index f5a2f6ac..182ab8ed 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -52,6 +52,11 @@ jobs: fail-fast: false steps: + - name: install node + run: | + git clone https://github.com/nodejs/node && git checkout v20.11.0 + ./configure && make -j4 && make install + - uses: actions/checkout@v3 - name: install rust From eb3993f55752aac79b7cc537a4894e09ff3e5f59 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Fri, 4 Oct 2024 10:25:23 -0700 Subject: [PATCH 04/17] setup node20 --- .github/workflows/package-rpm.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index 182ab8ed..c1a405ff 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -52,12 +52,11 @@ jobs: fail-fast: false steps: - - name: install node - run: | - git clone https://github.com/nodejs/node && git checkout v20.11.0 - ./configure && make -j4 && make install - - - uses: actions/checkout@v3 + - uses: actions/setup-node@v4 + with: + node-version: 20 + + - uses: actions/checkout@v4 - name: install rust run: | From f5597d1a23258d5c2bb274fa9feb690faa9e6ed8 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Fri, 4 Oct 2024 11:06:12 -0700 Subject: [PATCH 05/17] fix --- .github/workflows/package-rpm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index c1a405ff..ba189b09 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -52,7 +52,7 @@ jobs: fail-fast: false steps: - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v4 with: node-version: 20 From 5798d6335feb7e021dbc23fa75bf722823c81264 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Fri, 4 Oct 2024 11:19:53 -0700 Subject: [PATCH 06/17] trying to fix this... --- .github/workflows/package-rpm.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index ba189b09..d137e3b3 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -52,16 +52,13 @@ jobs: fail-fast: false steps: - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v2 with: node-version: 20 - uses: actions/checkout@v4 - - name: install rust - run: | - curl -sSf https://sh.rustup.rs | sh /dev/stdin -y - echo "PATH=$HOME/.cargo/bin:$PATH" >> "$GITHUB_ENV" + - uses: ./.github/actions/setup-rust - name: install build dependencies shell: bash From ad9b276514468e66649c7c4a2275b43a8d5a8d65 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Fri, 4 Oct 2024 11:21:22 -0700 Subject: [PATCH 07/17] fix? --- .github/workflows/package-rpm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index d137e3b3..ff529134 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -52,9 +52,9 @@ jobs: fail-fast: false steps: - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 18 - uses: actions/checkout@v4 From 3b341245d0474f982f1b2031844d6199dd38d642 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Fri, 4 Oct 2024 12:01:59 -0700 Subject: [PATCH 08/17] node from source --- .github/workflows/package-rpm.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index ff529134..dc8f039a 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -52,9 +52,18 @@ jobs: fail-fast: false steps: - - uses: actions/setup-node@v4 - with: - node-version: 18 + - name: install node + shell: bash + run: | + yum install python3 gcc10 gcc10-c++ + export CC=gcc10-cc + export CXX=gcc10-g++ + curl -O -L https://nodejs.org/dist/v20.18.0/node-v20.18.0.tar.gz + tar xzvf node-v20.18.0.tar.gz + cd node-v20.18.0 + ./configure + make -j + make install - uses: actions/checkout@v4 From 777b768b8320f81187ab5937fbe17c95bfb98cf3 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Fri, 4 Oct 2024 12:03:04 -0700 Subject: [PATCH 09/17] node from source --- .github/workflows/package-rpm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index dc8f039a..33528850 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -55,7 +55,7 @@ jobs: - name: install node shell: bash run: | - yum install python3 gcc10 gcc10-c++ + yum install -y python3 gcc10 gcc10-c++ export CC=gcc10-cc export CXX=gcc10-g++ curl -O -L https://nodejs.org/dist/v20.18.0/node-v20.18.0.tar.gz From 4bb76b799123d654f5a774635be0264e7128896b Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Fri, 4 Oct 2024 12:04:10 -0700 Subject: [PATCH 10/17] node from source --- .github/workflows/package-rpm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index 33528850..a37855ac 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -55,7 +55,7 @@ jobs: - name: install node shell: bash run: | - yum install -y python3 gcc10 gcc10-c++ + yum install -y python3 gcc10 gcc10-c++ tar export CC=gcc10-cc export CXX=gcc10-g++ curl -O -L https://nodejs.org/dist/v20.18.0/node-v20.18.0.tar.gz From ba98b5b6ec91f8201d8d7db6da91580379687e27 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Fri, 4 Oct 2024 12:05:10 -0700 Subject: [PATCH 11/17] node from source --- .github/workflows/package-rpm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index a37855ac..f977b986 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -55,7 +55,7 @@ jobs: - name: install node shell: bash run: | - yum install -y python3 gcc10 gcc10-c++ tar + yum install -y python3 gcc10 gcc10-c++ tar gzip export CC=gcc10-cc export CXX=gcc10-g++ curl -O -L https://nodejs.org/dist/v20.18.0/node-v20.18.0.tar.gz From dc8f97e454dfce4a5546b73d9ee178126047f5fc Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Fri, 4 Oct 2024 12:08:01 -0700 Subject: [PATCH 12/17] node from source --- .github/workflows/package-rpm.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index f977b986..52a7df88 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -52,7 +52,8 @@ jobs: fail-fast: false steps: - - name: install node + - name: install node (AmazonLinux2) + if: ${{ (matrix.distro == 'amazonlinux') && (matrix.version == 2) }} shell: bash run: | yum install -y python3 gcc10 gcc10-c++ tar gzip From 6856ee04a26b7ff0d29b921ec2aa41ff5b7a8018 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Fri, 4 Oct 2024 12:14:25 -0700 Subject: [PATCH 13/17] node from source --- .github/workflows/package-rpm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index 52a7df88..1b9f8eb5 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -56,7 +56,7 @@ jobs: if: ${{ (matrix.distro == 'amazonlinux') && (matrix.version == 2) }} shell: bash run: | - yum install -y python3 gcc10 gcc10-c++ tar gzip + yum install -y python3 gcc10 gcc10-c++ tar gzip binutils export CC=gcc10-cc export CXX=gcc10-g++ curl -O -L https://nodejs.org/dist/v20.18.0/node-v20.18.0.tar.gz From 776c73fb654fae39424ce72260a100e272d8e31c Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Fri, 4 Oct 2024 12:15:26 -0700 Subject: [PATCH 14/17] node from source --- .github/actions/setup-rust/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml index 6174991f..ecca5013 100644 --- a/.github/actions/setup-rust/action.yml +++ b/.github/actions/setup-rust/action.yml @@ -6,4 +6,4 @@ runs: steps: - uses: dtolnay/rust-toolchain@stable with: - components: clippy + components: clippy rustfmt From f598f6a9136a74e137eede675765a8ceb4003379 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Fri, 4 Oct 2024 12:20:28 -0700 Subject: [PATCH 15/17] node from source --- .github/workflows/package-rpm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index 1b9f8eb5..8c134843 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -63,7 +63,7 @@ jobs: tar xzvf node-v20.18.0.tar.gz cd node-v20.18.0 ./configure - make -j + make -j || make make install - uses: actions/checkout@v4 From 822194f24aaa06ec161fe0c35c7784749427216f Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Fri, 4 Oct 2024 12:21:29 -0700 Subject: [PATCH 16/17] node from source --- .github/workflows/package-rpm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index 8c134843..0512eeae 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -60,7 +60,7 @@ jobs: export CC=gcc10-cc export CXX=gcc10-g++ curl -O -L https://nodejs.org/dist/v20.18.0/node-v20.18.0.tar.gz - tar xzvf node-v20.18.0.tar.gz + tar xzf node-v20.18.0.tar.gz cd node-v20.18.0 ./configure make -j || make From ca1a1bc9fa5faeb7e069e47a3c96621ee0f3b48c Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Fri, 4 Oct 2024 12:24:52 -0700 Subject: [PATCH 17/17] node from source --- .github/workflows/package-rpm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-rpm.yml b/.github/workflows/package-rpm.yml index 0512eeae..26fdd11f 100644 --- a/.github/workflows/package-rpm.yml +++ b/.github/workflows/package-rpm.yml @@ -63,7 +63,7 @@ jobs: tar xzf node-v20.18.0.tar.gz cd node-v20.18.0 ./configure - make -j || make + make make install - uses: actions/checkout@v4