Add Fedora 41, remove Fedora 38

Fedora 38 was EOL on 2024-05-21.
rstudio · Nov 3, 2024 · 4571d17 · 4571d17
1 parent 964a433
commit 4571d17
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 32 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-PLATFORMS := ubuntu-2004 ubuntu-2204 ubuntu-2404 debian-10 debian-11 debian-12 centos-7 centos-8 rhel-9 opensuse-155 opensuse-156 fedora-38 fedora-39 fedora-40
+PLATFORMS := ubuntu-2004 ubuntu-2204 ubuntu-2404 debian-10 debian-11 debian-12 centos-7 centos-8 rhel-9 opensuse-155 opensuse-156 fedora-39 fedora-40 fedora-41
 SLS_BINARY ?= ./node_modules/serverless/bin/serverless.js
 
 deps:

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ R binaries are built for the following Linux operating systems:
 - openSUSE 15.5
 - openSUSE 15.6
 - SUSE Linux Enterprise 15 SP5
-- Fedora 39, 40
+- Fedora 39, 40, 41
 
 Operating systems are supported until their vendor end-of-support dates, which
 can be found on the [Posit Platform Support](https://posit.co/about/platform-support/)
@@ -168,6 +168,9 @@ curl -O https://cdn.posit.co/r/fedora-39/pkgs/R-${R_VERSION}-1-1.x86_64.rpm
 
 # Fedora 40
 curl -O https://cdn.posit.co/r/fedora-40/pkgs/R-${R_VERSION}-1-1.x86_64.rpm
+
+# Fedora 41
+curl -O https://cdn.posit.co/r/fedora-41/pkgs/R-${R_VERSION}-1-1.x86_64.rpm
 ```
 
 Then install the package:

diff --git a/builder/Dockerfile.fedora-38 → builder/Dockerfile.fedora-41 b/builder/Dockerfile.fedora-38 → builder/Dockerfile.fedora-41
@@ -1,6 +1,6 @@
-FROM fedora:38
+FROM fedora:41
 
-ENV OS_IDENTIFIER fedora-38
+ENV OS_IDENTIFIER fedora-41
 
 RUN dnf -y upgrade \
     && dnf -y install dnf-plugins-core \
@@ -58,7 +58,7 @@ RUN curl -LO "https://github.com/goreleaser/nfpm/releases/download/v2.18.1/nfpm_
 
 RUN chmod 0777 /opt
 
-# Configure flags that don't use the defaults in build.sh
+# Configure flags for that don't use the defaults in build.sh
 ENV CONFIGURE_OPTIONS="\
     --enable-R-shlib \
     --with-tcltk \
@@ -82,7 +82,7 @@ ENV JAVA_HOME=/usr/lib/jvm/jre-11-openjdk
 # R 3.x requires PCRE2 for Pango support on RHEL 9
 ENV INCLUDE_PCRE2_IN_R_3 yes
 
-COPY package.fedora-38 /package.sh
+COPY package.fedora-41 /package.sh
 COPY build.sh .
 COPY patches /patches
 ENTRYPOINT ./build.sh
diff --git a/builder/docker-compose.yml b/builder/docker-compose.yml
@@ -131,39 +131,39 @@ services:
     image: r-builds:opensuse-156
     volumes:
       - ./integration/tmp:/tmp/output
-  fedora-38:
+  fedora-39:
     command: ./build.sh
     environment:
       - R_VERSION=${R_VERSION}
       - R_INSTALL_PATH=${R_INSTALL_PATH}
       - LOCAL_STORE=/tmp/output
     build:
       context: .
-      dockerfile: Dockerfile.fedora-38
-    image: r-builds:fedora-38
+      dockerfile: Dockerfile.fedora-39
+    image: r-builds:fedora-39
     volumes:
       - ./integration/tmp:/tmp/output
-  fedora-39:
+  fedora-40:
     command: ./build.sh
     environment:
       - R_VERSION=${R_VERSION}
       - R_INSTALL_PATH=${R_INSTALL_PATH}
       - LOCAL_STORE=/tmp/output
     build:
       context: .
-      dockerfile: Dockerfile.fedora-39
-    image: r-builds:fedora-39
+      dockerfile: Dockerfile.fedora-40
+    image: r-builds:fedora-40
     volumes:
       - ./integration/tmp:/tmp/output
-  fedora-40:
+  fedora-41:
     command: ./build.sh
     environment:
       - R_VERSION=${R_VERSION}
       - R_INSTALL_PATH=${R_INSTALL_PATH}
       - LOCAL_STORE=/tmp/output
     build:
       context: .
-      dockerfile: Dockerfile.fedora-40
-    image: r-builds:fedora-40
+      dockerfile: Dockerfile.fedora-41
+    image: r-builds:fedora-41
     volumes:
       - ./integration/tmp:/tmp/output
diff --git a/builder/package.fedora-38 → builder/package.fedora-41 b/builder/package.fedora-38 → builder/package.fedora-41
@@ -56,6 +56,7 @@ ${pcre_libs}
 - tcl
 - tk
 - unzip
+- util-linux-core
 - which
 - xz-devel
 - zip

diff --git a/serverless-resources.yml b/serverless-resources.yml
@@ -285,7 +285,7 @@ rBuildsBatchJobDefinitionOpensuse156:
       Image: !Sub "${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/r-builds:opensuse-156"
     Timeout:
       AttemptDurationSeconds: 7200
-rBuildsBatchJobDefinitionFedora38:
+rBuildsBatchJobDefinitionFedora39:
   Type: AWS::Batch::JobDefinition
   Properties:
     Type: container
@@ -296,10 +296,10 @@ rBuildsBatchJobDefinitionFedora38:
       Memory: 4096
       JobRoleArn:
         "Fn::GetAtt": [ rBuildsEcsTaskIamRole, Arn ]
-      Image: !Sub "${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/r-builds:fedora-38"
+      Image: !Sub "${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/r-builds:fedora-39"
     Timeout:
       AttemptDurationSeconds: 7200
-rBuildsBatchJobDefinitionFedora39:
+rBuildsBatchJobDefinitionFedora40:
   Type: AWS::Batch::JobDefinition
   Properties:
     Type: container
@@ -310,10 +310,10 @@ rBuildsBatchJobDefinitionFedora39:
       Memory: 4096
       JobRoleArn:
         "Fn::GetAtt": [ rBuildsEcsTaskIamRole, Arn ]
-      Image: !Sub "${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/r-builds:fedora-39"
+      Image: !Sub "${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/r-builds:fedora-40"
     Timeout:
       AttemptDurationSeconds: 7200
-rBuildsBatchJobDefinitionFedora40:
+rBuildsBatchJobDefinitionFedora41:
   Type: AWS::Batch::JobDefinition
   Properties:
     Type: container
@@ -324,7 +324,7 @@ rBuildsBatchJobDefinitionFedora40:
       Memory: 4096
       JobRoleArn:
         "Fn::GetAtt": [ rBuildsEcsTaskIamRole, Arn ]
-      Image: !Sub "${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/r-builds:fedora-40"
+      Image: !Sub "${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/r-builds:fedora-41"
     Timeout:
       AttemptDurationSeconds: 7200
 

diff --git a/serverless.yml b/serverless.yml
@@ -77,13 +77,13 @@ provider:
       Ref: rBuildsBatchJobDefinitionOpensuse155
     JOB_DEFINITION_ARN_opensuse_156:
       Ref: rBuildsBatchJobDefinitionOpensuse156
-    JOB_DEFINITION_ARN_fedora_38:
-      Ref: rBuildsBatchJobDefinitionFedora38
     JOB_DEFINITION_ARN_fedora_39:
       Ref: rBuildsBatchJobDefinitionFedora39
     JOB_DEFINITION_ARN_fedora_40:
       Ref: rBuildsBatchJobDefinitionFedora40
-    SUPPORTED_PLATFORMS: ubuntu-2004,ubuntu-2204,ubuntu-2404,debian-10,debian-11,debian-12,centos-7,centos-8,rhel-9,opensuse-155,opensuse-156,fedora-38,fedora-39,fedora-40
+    JOB_DEFINITION_ARN_fedora_41:
+      Ref: rBuildsBatchJobDefinitionFedora41
+    SUPPORTED_PLATFORMS: ubuntu-2004,ubuntu-2204,ubuntu-2404,debian-10,debian-11,debian-12,centos-7,centos-8,rhel-9,opensuse-155,opensuse-156,fedora-39,fedora-40,fedora-41
 
 functions:
   queueBuilds:

diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -89,14 +89,6 @@ services:
       - R_VERSION=${R_VERSION}
     volumes:
       - ../:/r-builds
-  fedora-38:
-    image: fedora:38
-    command: /r-builds/test/test-yum.sh
-    environment:
-      - OS_IDENTIFIER=fedora-38
-      - R_VERSION=${R_VERSION}
-    volumes:
-      - ../:/r-builds
   fedora-39:
     image: fedora:39
     command: /r-builds/test/test-yum.sh
@@ -113,3 +105,11 @@ services:
       - R_VERSION=${R_VERSION}
     volumes:
       - ../:/r-builds
+  fedora-41:
+    image: fedora:41
+    command: /r-builds/test/test-yum.sh
+    environment:
+      - OS_IDENTIFIER=fedora-41
+      - R_VERSION=${R_VERSION}
+    volumes:
+      - ../:/r-builds