From 8c67f2b22fcc3b729858e8316ebee6a3ff0c3170 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 18:04:14 +0000 Subject: [PATCH 01/10] Bump zipp from 3.11.0 to 3.19.1 in /docs Bumps [zipp](https://github.com/jaraco/zipp) from 3.11.0 to 3.19.1. - [Release notes](https://github.com/jaraco/zipp/releases) - [Changelog](https://github.com/jaraco/zipp/blob/main/NEWS.rst) - [Commits](https://github.com/jaraco/zipp/compare/v3.11.0...v3.19.1) --- updated-dependencies: - dependency-name: zipp dependency-type: indirect ... Signed-off-by: dependabot[bot] --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 4a92109f..bc4d069a 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -36,5 +36,5 @@ six==1.16.0 # via python-dateutil watchdog==2.2.1 # via mkdocs -zipp==3.11.0 +zipp==3.19.1 # via importlib-metadata From 58ff46387ebb97c8ae7c481657cfd62f956369f3 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Wed, 10 Jul 2024 09:12:16 +0800 Subject: [PATCH 02/10] Update macos version in circle ci --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7baebeb2..304c3605 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -117,9 +117,9 @@ jobs: command: | nix-channel --update nix-build - bigsur: + ventura: macos: - xcode: 12.5.1 + xcode: 13.4.1 steps: - checkout - run: From 3e2b6cbbf6e83a148aed78d8563dc18bc329a48d Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Wed, 10 Jul 2024 09:12:54 +0800 Subject: [PATCH 03/10] Fix missing job name in circleci --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 304c3605..54f41781 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -170,4 +170,4 @@ workflows: parameters: distro: [fedora37, fedora38, centos8, centos9, debian11, ubuntu2204, archlinux, opensuse15, alpine317] - nixos - - bigsur + - ventura From 3fac68a0ed4226fbfa9a491d8f987a9182e1c1be Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Wed, 10 Jul 2024 09:13:42 +0800 Subject: [PATCH 04/10] Update freebsd image in cirrus --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 7a4e08be..41751e66 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -4,7 +4,7 @@ task: matrix: - image_family: freebsd-15-0-snap - image_family: freebsd-14-0 - - image_family: freebsd-13-2 + - image_family: freebsd-13-3 install_script: pkg install -y bash git autoconf automake libtool groff pkgconf build_script: - ./Configure -n freebsd From 0691a25718dfd13088da81b7600135d47896781f Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Wed, 10 Jul 2024 09:14:17 +0800 Subject: [PATCH 05/10] Drop EOL centos 8 --- .circleci/config.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 54f41781..33f750d4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,9 +24,6 @@ executors: fedora38: docker: - image: docker.io/fedora:38 - centos8: - docker: - - image: quay.io/centos/centos:stream8 centos9: docker: - image: quay.io/centos/centos:stream9 @@ -168,6 +165,6 @@ workflows: - linux: matrix: parameters: - distro: [fedora37, fedora38, centos8, centos9, debian11, ubuntu2204, archlinux, opensuse15, alpine317] + distro: [fedora37, fedora38, centos9, debian11, ubuntu2204, archlinux, opensuse15, alpine317] - nixos - ventura From ab17fa0725139d916e8fb5bc602d4fb6da212af8 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Wed, 10 Jul 2024 09:15:25 +0800 Subject: [PATCH 06/10] Add debian 12 to circle ci --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 33f750d4..2802aee3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,6 +18,9 @@ executors: debian11: docker: - image: docker.io/debian:11 + debian12: + docker: + - image: docker.io/debian:12 fedora37: docker: - image: docker.io/fedora:37 @@ -165,6 +168,6 @@ workflows: - linux: matrix: parameters: - distro: [fedora37, fedora38, centos9, debian11, ubuntu2204, archlinux, opensuse15, alpine317] + distro: [fedora37, fedora38, centos9, debian11, debian12, ubuntu2204, archlinux, opensuse15, alpine317] - nixos - ventura From e96558de91ef80e7c1037885004c52735bff6edc Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Wed, 10 Jul 2024 09:20:24 +0800 Subject: [PATCH 07/10] Install autoconf in circleci ventura --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2802aee3..adfc2586 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -125,7 +125,7 @@ jobs: - run: name: Install pkg-config command: | - brew install pkg-config libtool + brew install pkg-config libtool autoconf automake - run: name: Configure command: | From c4518aa52ed8fafcbb71f410cedf9e14f91e4c4d Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Wed, 10 Jul 2024 09:26:56 +0800 Subject: [PATCH 08/10] Do not install to system in ci --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index adfc2586..38a4e567 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,7 +145,7 @@ jobs: autoreconf -vif ./configure make - make install + DESTDIR=$PWD/install make install make check - run: name: Rebuild and test using distribution tarball @@ -157,7 +157,7 @@ jobs: cd lsof-* ./configure make - make install + DESTDIR=$PWD/install make install make check # Invoke jobs via workflows From 3658d92572567f417a693c6f20301c117e508a5e Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Wed, 10 Jul 2024 09:37:17 +0800 Subject: [PATCH 09/10] Create missing folder for make install in ci --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 38a4e567..00569abd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,6 +145,7 @@ jobs: autoreconf -vif ./configure make + mkdir -p $PWD/install DESTDIR=$PWD/install make install make check - run: From e0ec5daf40a28c035537948ca52a65c63f078b0f Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Wed, 10 Jul 2024 09:37:47 +0800 Subject: [PATCH 10/10] Rename DESTDIR to avoid name collision --- .circleci/config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 00569abd..b7f18d50 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,8 +145,7 @@ jobs: autoreconf -vif ./configure make - mkdir -p $PWD/install - DESTDIR=$PWD/install make install + DESTDIR=$PWD/prefix make install make check - run: name: Rebuild and test using distribution tarball @@ -158,7 +157,7 @@ jobs: cd lsof-* ./configure make - DESTDIR=$PWD/install make install + DESTDIR=$PWD/prefix make install make check # Invoke jobs via workflows