From 37af15c24536ad0d290ceb641fbc4af6538cefd6 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 13 Apr 2020 10:09:25 -0400 Subject: [PATCH 1/5] Bump CentOS from 7 to 8 on CI --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 45e42bca4..41e4ea7fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ workflows: requires: - "fedora-29" - - "centos-7" + - "centos-8" - "slackware-14.2" @@ -67,7 +67,7 @@ workflows: - "build-image-ubuntu-18.04" - "build-image-fedora-28" - "build-image-fedora-29" - - "build-image-centos-7" + - "build-image-centos-8" - "build-image-slackware-14.2" - "build-image-pypy-2.7-7.1.1-jessie" @@ -269,9 +269,9 @@ jobs: user: "nobody" - centos-7: &RHEL_DERIV + centos-8: &RHEL_DERIV docker: - - image: "tahoelafsci/centos:7" + - image: "tahoelafsci/centos:8" user: "nobody" environment: *UTF_8_ENVIRONMENT @@ -481,12 +481,12 @@ jobs: TAG: "18.04" - build-image-centos-7: + build-image-centos-8: <<: *BUILD_IMAGE environment: DISTRO: "centos" - TAG: "7" + TAG: "8" build-image-fedora-28: From 757dd61eb5c63e06f0add5ff560a9f141ebc1706 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 13 Apr 2020 10:11:36 -0400 Subject: [PATCH 2/5] news fragment --- newsfragments/3296.installation | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/3296.installation diff --git a/newsfragments/3296.installation b/newsfragments/3296.installation new file mode 100644 index 000000000..78cf83f60 --- /dev/null +++ b/newsfragments/3296.installation @@ -0,0 +1 @@ +Tahoe-LAFS now supports CentOS 8 and no longer supports CentOS 7. \ No newline at end of file From 02ca2ad219096814664eee769497f889db323e02 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 13 Apr 2020 10:38:52 -0400 Subject: [PATCH 3/5] This package has been renamed --- .circleci/Dockerfile.centos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/Dockerfile.centos b/.circleci/Dockerfile.centos index aeb9eb914..9fb6b7c2b 100644 --- a/.circleci/Dockerfile.centos +++ b/.circleci/Dockerfile.centos @@ -12,7 +12,7 @@ RUN yum install --assumeyes \ sudo \ make automake gcc gcc-c++ \ python \ - python-devel \ + python2-devel \ libffi-devel \ openssl-devel \ libyaml-devel \ From 74f46b66868ad96af10dba4caf3cd2829a9b876f Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 13 Apr 2020 10:57:28 -0400 Subject: [PATCH 4/5] this one renamed too --- .circleci/Dockerfile.centos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/Dockerfile.centos b/.circleci/Dockerfile.centos index 9fb6b7c2b..146414560 100644 --- a/.circleci/Dockerfile.centos +++ b/.circleci/Dockerfile.centos @@ -11,7 +11,7 @@ RUN yum install --assumeyes \ git \ sudo \ make automake gcc gcc-c++ \ - python \ + python2 \ python2-devel \ libffi-devel \ openssl-devel \ From 5ccc241990595186588526cde463e00f44acf8ab Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 13 Apr 2020 10:57:37 -0400 Subject: [PATCH 5/5] no more libyaml-devel, maybe it was merged into libyaml --- .circleci/Dockerfile.centos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/Dockerfile.centos b/.circleci/Dockerfile.centos index 146414560..febb61545 100644 --- a/.circleci/Dockerfile.centos +++ b/.circleci/Dockerfile.centos @@ -15,7 +15,7 @@ RUN yum install --assumeyes \ python2-devel \ libffi-devel \ openssl-devel \ - libyaml-devel \ + libyaml \ /usr/bin/virtualenv \ net-tools