Skip to content

Commit 79c3460

Browse files
thecatcorethecatcore
committed
Drop Fedora 38 and add Fedora 41 instead
1 parent 30e6c44 commit 79c3460

File tree

3 files changed

+55
-55
lines changed

3 files changed

+55
-55
lines changed

‎.github/workflows/generate-release-yml.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fn parse_pattern(pattern: &String) -> Option<(Pattern, Vec<&'static str>)> {
3838
} else if pattern.contains("%FEDORA_STABLE_VERSION%") {
3939
Some((
4040
Box::new(move |p: &str, s: &str| p.replace("%FEDORA_STABLE_VERSION%", s)),
41-
vec!["38", "39", "40"],
41+
vec!["39", "40", "41"],
4242
))
4343
} else {
4444
None

‎.github/workflows/release.yml

+21-21
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
file: watchman/build/package/ubuntu-env/Dockerfile
9292
push: true
9393
tags: "${{ format('ghcr.io/{0}/watchman-build-env-ubuntu-24:latest', github.repository) }}"
94-
docker-fedora-38:
94+
docker-fedora-39:
9595
runs-on: ubuntu-latest
9696
steps:
9797
- name: Checkout code
@@ -108,11 +108,11 @@ jobs:
108108
uses: docker/build-push-action@v6
109109
with:
110110
context: "."
111-
build-args: FEDORA_VERSION=38
111+
build-args: FEDORA_VERSION=39
112112
file: watchman/build/package/fedora-env/Dockerfile
113113
push: true
114-
tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-38:latest', github.repository) }}"
115-
docker-fedora-39:
114+
tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-39:latest', github.repository) }}"
115+
docker-fedora-40:
116116
runs-on: ubuntu-latest
117117
steps:
118118
- name: Checkout code
@@ -129,11 +129,11 @@ jobs:
129129
uses: docker/build-push-action@v6
130130
with:
131131
context: "."
132-
build-args: FEDORA_VERSION=39
132+
build-args: FEDORA_VERSION=40
133133
file: watchman/build/package/fedora-env/Dockerfile
134134
push: true
135-
tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-39:latest', github.repository) }}"
136-
docker-fedora-40:
135+
tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-40:latest', github.repository) }}"
136+
docker-fedora-41:
137137
runs-on: ubuntu-latest
138138
steps:
139139
- name: Checkout code
@@ -150,10 +150,10 @@ jobs:
150150
uses: docker/build-push-action@v6
151151
with:
152152
context: "."
153-
build-args: FEDORA_VERSION=40
153+
build-args: FEDORA_VERSION=41
154154
file: watchman/build/package/fedora-env/Dockerfile
155155
push: true
156-
tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-40:latest', github.repository) }}"
156+
tags: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-41:latest', github.repository) }}"
157157
clone-build-package-ubuntu-20:
158158
needs:
159159
- prepare
@@ -247,13 +247,13 @@ jobs:
247247
asset_path: /_debs/watchman.deb
248248
asset_name: "watchman_ubuntu24.04_${{ needs.prepare.outputs.release }}.deb"
249249
asset_content_type: application/x-deb
250-
clone-build-package-fedora-38:
250+
clone-build-package-fedora-39:
251251
needs:
252252
- prepare
253-
- docker-fedora-38
253+
- docker-fedora-39
254254
runs-on: ubuntu-latest
255255
container:
256-
image: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-38:latest', github.repository) }}"
256+
image: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-39:latest', github.repository) }}"
257257
steps:
258258
- name: Fix HOME
259259
run: echo HOME=/root >> $GITHUB_ENV
@@ -268,7 +268,7 @@ jobs:
268268
- name: Make .rpm
269269
id: make_rpm
270270
env:
271-
FEDORA_VERSION: "38"
271+
FEDORA_VERSION: "39"
272272
run: "./watchman/build/package/make-rpm.sh"
273273
- name: Upload .rpm
274274
env:
@@ -279,13 +279,13 @@ jobs:
279279
asset_path: "${{ steps.make_rpm.outputs.rpm_path }}"
280280
asset_name: "${{ steps.make_rpm.outputs.rpm_name }}"
281281
asset_content_type: application/x-rpm
282-
clone-build-package-fedora-39:
282+
clone-build-package-fedora-40:
283283
needs:
284284
- prepare
285-
- docker-fedora-39
285+
- docker-fedora-40
286286
runs-on: ubuntu-latest
287287
container:
288-
image: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-39:latest', github.repository) }}"
288+
image: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-40:latest', github.repository) }}"
289289
steps:
290290
- name: Fix HOME
291291
run: echo HOME=/root >> $GITHUB_ENV
@@ -300,7 +300,7 @@ jobs:
300300
- name: Make .rpm
301301
id: make_rpm
302302
env:
303-
FEDORA_VERSION: "39"
303+
FEDORA_VERSION: "40"
304304
run: "./watchman/build/package/make-rpm.sh"
305305
- name: Upload .rpm
306306
env:
@@ -311,13 +311,13 @@ jobs:
311311
asset_path: "${{ steps.make_rpm.outputs.rpm_path }}"
312312
asset_name: "${{ steps.make_rpm.outputs.rpm_name }}"
313313
asset_content_type: application/x-rpm
314-
clone-build-package-fedora-40:
314+
clone-build-package-fedora-41:
315315
needs:
316316
- prepare
317-
- docker-fedora-40
317+
- docker-fedora-41
318318
runs-on: ubuntu-latest
319319
container:
320-
image: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-40:latest', github.repository) }}"
320+
image: "${{ format('ghcr.io/{0}/watchman-build-env-fedora-41:latest', github.repository) }}"
321321
steps:
322322
- name: Fix HOME
323323
run: echo HOME=/root >> $GITHUB_ENV
@@ -332,7 +332,7 @@ jobs:
332332
- name: Make .rpm
333333
id: make_rpm
334334
env:
335-
FEDORA_VERSION: "40"
335+
FEDORA_VERSION: "41"
336336
run: "./watchman/build/package/make-rpm.sh"
337337
- name: Upload .rpm
338338
env:

‎build/fbcode_builder/patches/zlib_dont_build_more_than_needed.patch

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
diff -Naur ../zlib-1.3.1/CMakeLists.txt ./CMakeLists.txt
2-
--- ../zlib-1.3.1/CMakeLists.txt 2024-01-22 10:32:37.000000000 -0800
3-
+++ ./CMakeLists.txt 2024-01-23 13:14:09.870289968 -0800
4-
@@ -149,10 +149,8 @@
5-
set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
6-
endif(MINGW)
7-
8-
-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
9-
+add_library(zlib ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
10-
target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
11-
-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
12-
-target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
13-
set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
14-
set_target_properties(zlib PROPERTIES SOVERSION 1)
15-
16-
@@ -169,7 +167,7 @@
17-
18-
if(UNIX)
19-
# On unix-like platforms the library is almost always called libz
20-
- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
21-
+ set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
22-
if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))
23-
set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
24-
endif()
25-
@@ -179,7 +177,7 @@
26-
endif()
27-
28-
if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
29-
- install(TARGETS zlib zlibstatic
30-
+ install(TARGETS zlib
31-
RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
32-
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
33-
LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
1+
diff -Naur ../zlib-1.3.1/CMakeLists.txt ./CMakeLists.txt
2+
--- ../zlib-1.3.1/CMakeLists.txt 2024-01-22 10:32:37.000000000 -0800
3+
+++ ./CMakeLists.txt 2024-01-23 13:14:09.870289968 -0800
4+
@@ -149,10 +149,8 @@
5+
set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
6+
endif(MINGW)
7+
8+
-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
9+
+add_library(zlib ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
10+
target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
11+
-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
12+
-target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
13+
set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
14+
set_target_properties(zlib PROPERTIES SOVERSION 1)
15+
16+
@@ -169,7 +167,7 @@
17+
18+
if(UNIX)
19+
# On unix-like platforms the library is almost always called libz
20+
- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
21+
+ set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
22+
if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))
23+
set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
24+
endif()
25+
@@ -179,7 +177,7 @@
26+
endif()
27+
28+
if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
29+
- install(TARGETS zlib zlibstatic
30+
+ install(TARGETS zlib
31+
RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
32+
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
33+
LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
3434

0 commit comments

Comments
 (0)