Drop Fedora 38 and add Fedora 41 instead

facebook · Dec 20, 2024 · 79c3460 · 79c3460
1 parent 30e6c44
commit 79c3460
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 55 deletions.
diff --git a/.github/workflows/generate-release-yml.rs b/.github/workflows/generate-release-yml.rs
@@ -38,7 +38,7 @@ fn parse_pattern(pattern: &String) -> Option<(Pattern, Vec<&'static str>)> {
     } else if pattern.contains("%FEDORA_STABLE_VERSION%") {
         Some((
             Box::new(move |p: &str, s: &str| p.replace("%FEDORA_STABLE_VERSION%", s)),
-            vec!["38", "39", "40"],
+            vec!["39", "40", "41"],
         ))
     } else {
         None

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -91,7 +91,7 @@ jobs:
           file: watchman/build/package/ubuntu-env/Dockerfile
           push: true
           tags: "${{ format('ghcr.io/{0}/watchman-build-env-ubuntu-24:latest', github.repository) }}"
-  docker-fedora-38:
+  docker-fedora-39:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -108,11 +108,11 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: "."
-          build-args: FEDORA_VERSION=38
+          build-args: FEDORA_VERSION=39
           file: watchman/build/package/fedora-env/Dockerfile
           push: true
-          tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-38:latest', github.repository) }}"
-  docker-fedora-39:
+          tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-39:latest', github.repository) }}"
+  docker-fedora-40:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -129,11 +129,11 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: "."
-          build-args: FEDORA_VERSION=39
+          build-args: FEDORA_VERSION=40
           file: watchman/build/package/fedora-env/Dockerfile
           push: true
-          tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-39:latest', github.repository) }}"
-  docker-fedora-40:
+          tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-40:latest', github.repository) }}"
+  docker-fedora-41:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -150,10 +150,10 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: "."
-          build-args: FEDORA_VERSION=40
+          build-args: FEDORA_VERSION=41
           file: watchman/build/package/fedora-env/Dockerfile
           push: true
-          tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-40:latest', github.repository) }}"
+          tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-41:latest', github.repository) }}"
   clone-build-package-ubuntu-20:
     needs:
       - prepare
@@ -247,13 +247,13 @@ jobs:
           asset_path: /_debs/watchman.deb
           asset_name: "watchman_ubuntu24.04_${{ needs.prepare.outputs.release }}.deb"
           asset_content_type: application/x-deb
-  clone-build-package-fedora-38:
+  clone-build-package-fedora-39:
     needs:
       - prepare
-      - docker-fedora-38
+      - docker-fedora-39
     runs-on: ubuntu-latest
     container:
-      image: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-38:latest', github.repository) }}"
+      image: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-39:latest', github.repository) }}"
     steps:
       - name: Fix HOME
         run: echo HOME=/root >> $GITHUB_ENV
@@ -268,7 +268,7 @@ jobs:
       - name: Make .rpm
         id: make_rpm
         env:
-          FEDORA_VERSION: "38"
+          FEDORA_VERSION: "39"
         run: "./watchman/build/package/make-rpm.sh"
       - name: Upload .rpm
         env:
@@ -279,13 +279,13 @@ jobs:
           asset_path: "${{ steps.make_rpm.outputs.rpm_path }}"
           asset_name: "${{ steps.make_rpm.outputs.rpm_name }}"
           asset_content_type: application/x-rpm
-  clone-build-package-fedora-39:
+  clone-build-package-fedora-40:
     needs:
       - prepare
-      - docker-fedora-39
+      - docker-fedora-40
     runs-on: ubuntu-latest
     container:
-      image: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-39:latest', github.repository) }}"
+      image: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-40:latest', github.repository) }}"
     steps:
       - name: Fix HOME
         run: echo HOME=/root >> $GITHUB_ENV
@@ -300,7 +300,7 @@ jobs:
       - name: Make .rpm
         id: make_rpm
         env:
-          FEDORA_VERSION: "39"
+          FEDORA_VERSION: "40"
         run: "./watchman/build/package/make-rpm.sh"
       - name: Upload .rpm
         env:
@@ -311,13 +311,13 @@ jobs:
           asset_path: "${{ steps.make_rpm.outputs.rpm_path }}"
           asset_name: "${{ steps.make_rpm.outputs.rpm_name }}"
           asset_content_type: application/x-rpm
-  clone-build-package-fedora-40:
+  clone-build-package-fedora-41:
     needs:
       - prepare
-      - docker-fedora-40
+      - docker-fedora-41
     runs-on: ubuntu-latest
     container:
-      image: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-40:latest', github.repository) }}"
+      image: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-41:latest', github.repository) }}"
     steps:
       - name: Fix HOME
         run: echo HOME=/root >> $GITHUB_ENV
@@ -332,7 +332,7 @@ jobs:
       - name: Make .rpm
         id: make_rpm
         env:
-          FEDORA_VERSION: "40"
+          FEDORA_VERSION: "41"
         run: "./watchman/build/package/make-rpm.sh"
       - name: Upload .rpm
         env:

diff --git a/build/fbcode_builder/patches/zlib_dont_build_more_than_needed.patch b/build/fbcode_builder/patches/zlib_dont_build_more_than_needed.patch
@@ -1,34 +1,34 @@
-diff -Naur ../zlib-1.3.1/CMakeLists.txt ./CMakeLists.txt
---- ../zlib-1.3.1/CMakeLists.txt	2024-01-22 10:32:37.000000000 -0800
-+++ ./CMakeLists.txt	2024-01-23 13:14:09.870289968 -0800
-@@ -149,10 +149,8 @@
-     set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
- endif(MINGW)
-
--add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-+add_library(zlib ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
- target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
--add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
--target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
- set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
- set_target_properties(zlib PROPERTIES SOVERSION 1)
-
-@@ -169,7 +167,7 @@
-
- if(UNIX)
-     # On unix-like platforms the library is almost always called libz
--   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
-+   set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
-    if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))
-      set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
-    endif()
-@@ -179,7 +177,7 @@
- endif()
-
- if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
--    install(TARGETS zlib zlibstatic
-+    install(TARGETS zlib
-         RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
-         ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
-         LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
+diff -Naur ../zlib-1.3.1/CMakeLists.txt ./CMakeLists.txt
+--- ../zlib-1.3.1/CMakeLists.txt	2024-01-22 10:32:37.000000000 -0800
++++ ./CMakeLists.txt	2024-01-23 13:14:09.870289968 -0800
+@@ -149,10 +149,8 @@
+     set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+ endif(MINGW)
+
+-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
++add_library(zlib ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+ target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+-target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+ set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+ set_target_properties(zlib PROPERTIES SOVERSION 1)
+
+@@ -169,7 +167,7 @@
+
+ if(UNIX)
+     # On unix-like platforms the library is almost always called libz
+-   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
++   set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
+    if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))
+      set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
+    endif()
+@@ -179,7 +177,7 @@
+ endif()
+
+ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
+-    install(TARGETS zlib zlibstatic
++    install(TARGETS zlib
+         RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+         ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+         LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )