Skip to content

Commit f226cec

Browse files
ahornbyfacebook-github-bot
ahornby
authored and
facebook-github-bot
committed
regenerate github actions, fix cmake 4 failure
Summary: X-link: facebook/fb303#65 regenerate github actions before making any actual changes github runners are on cmake 4 now, update cmake min version to 3.5 to avoid cmake 4 error: https://cmake.org/cmake/help/latest/release/4.0.html#deprecated-and-removed-features Reviewed By: markbt Differential Revision: D72323421 fbshipit-source-id: 5ebae9a37dbfa0b95cf75b20c86d396f8d5aa7ab
1 parent 3e066c5 commit f226cec

File tree

3 files changed

+20
-96
lines changed

3 files changed

+20
-96
lines changed

‎.github/workflows/mononoke-integration_linux.yml

+19-19
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ jobs:
123123
- name: Fetch folly
124124
if: ${{ steps.paths.outputs.folly_SOURCE }}
125125
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests folly
126+
- name: Fetch nmap
127+
if: ${{ steps.paths.outputs.nmap_SOURCE }}
128+
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests nmap
126129
- name: Fetch libffi
127130
if: ${{ steps.paths.outputs.libffi_SOURCE }}
128131
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libffi
@@ -132,9 +135,6 @@ jobs:
132135
- name: Fetch python
133136
if: ${{ steps.paths.outputs.python_SOURCE }}
134137
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests python
135-
- name: Fetch nmap
136-
if: ${{ steps.paths.outputs.nmap_SOURCE }}
137-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests nmap
138138
- name: Fetch openssl
139139
if: ${{ steps.paths.outputs.openssl_SOURCE }}
140140
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests openssl
@@ -671,6 +671,22 @@ jobs:
671671
with:
672672
path: ${{ steps.paths.outputs.folly_INSTALL }}
673673
key: ${{ steps.paths.outputs.folly_CACHE_KEY }}-install
674+
- name: Restore nmap from cache
675+
id: restore_nmap
676+
if: ${{ steps.paths.outputs.nmap_SOURCE }}
677+
uses: actions/cache/restore@v4
678+
with:
679+
path: ${{ steps.paths.outputs.nmap_INSTALL }}
680+
key: ${{ steps.paths.outputs.nmap_CACHE_KEY }}-install
681+
- name: Build nmap
682+
if: ${{ steps.paths.outputs.nmap_SOURCE && ! steps.restore_nmap.outputs.cache-hit }}
683+
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests nmap
684+
- name: Save nmap to cache
685+
uses: actions/cache/save@v4
686+
if: ${{ steps.paths.outputs.nmap_SOURCE && ! steps.restore_nmap.outputs.cache-hit }}
687+
with:
688+
path: ${{ steps.paths.outputs.nmap_INSTALL }}
689+
key: ${{ steps.paths.outputs.nmap_CACHE_KEY }}-install
674690
- name: Restore libffi from cache
675691
id: restore_libffi
676692
if: ${{ steps.paths.outputs.libffi_SOURCE }}
@@ -719,22 +735,6 @@ jobs:
719735
with:
720736
path: ${{ steps.paths.outputs.python_INSTALL }}
721737
key: ${{ steps.paths.outputs.python_CACHE_KEY }}-install
722-
- name: Restore nmap from cache
723-
id: restore_nmap
724-
if: ${{ steps.paths.outputs.nmap_SOURCE }}
725-
uses: actions/cache/restore@v4
726-
with:
727-
path: ${{ steps.paths.outputs.nmap_INSTALL }}
728-
key: ${{ steps.paths.outputs.nmap_CACHE_KEY }}-install
729-
- name: Build nmap
730-
if: ${{ steps.paths.outputs.nmap_SOURCE && ! steps.restore_nmap.outputs.cache-hit }}
731-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --no-tests nmap
732-
- name: Save nmap to cache
733-
uses: actions/cache/save@v4
734-
if: ${{ steps.paths.outputs.nmap_SOURCE && ! steps.restore_nmap.outputs.cache-hit }}
735-
with:
736-
path: ${{ steps.paths.outputs.nmap_INSTALL }}
737-
key: ${{ steps.paths.outputs.nmap_CACHE_KEY }}-install
738738
- name: Restore openssl from cache
739739
id: restore_openssl
740740
if: ${{ steps.paths.outputs.openssl_SOURCE }}

‎.github/workflows/mononoke_linux.yml

-76
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@ jobs:
8181
- name: Fetch zlib
8282
if: ${{ steps.paths.outputs.zlib_SOURCE }}
8383
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zlib
84-
- name: Fetch bz2
85-
if: ${{ steps.paths.outputs.bz2_SOURCE }}
86-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests bz2
8784
- name: Fetch openssl
8885
if: ${{ steps.paths.outputs.openssl_SOURCE }}
8986
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests openssl
@@ -120,15 +117,6 @@ jobs:
120117
- name: Fetch mvfst
121118
if: ${{ steps.paths.outputs.mvfst_SOURCE }}
122119
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests mvfst
123-
- name: Fetch libffi
124-
if: ${{ steps.paths.outputs.libffi_SOURCE }}
125-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libffi
126-
- name: Fetch ncurses
127-
if: ${{ steps.paths.outputs.ncurses_SOURCE }}
128-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests ncurses
129-
- name: Fetch python
130-
if: ${{ steps.paths.outputs.python_SOURCE }}
131-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests python
132120
- name: Fetch wangle
133121
if: ${{ steps.paths.outputs.wangle_SOURCE }}
134122
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests wangle
@@ -397,22 +385,6 @@ jobs:
397385
with:
398386
path: ${{ steps.paths.outputs.zlib_INSTALL }}
399387
key: ${{ steps.paths.outputs.zlib_CACHE_KEY }}-install
400-
- name: Restore bz2 from cache
401-
id: restore_bz2
402-
if: ${{ steps.paths.outputs.bz2_SOURCE }}
403-
uses: actions/cache/restore@v4
404-
with:
405-
path: ${{ steps.paths.outputs.bz2_INSTALL }}
406-
key: ${{ steps.paths.outputs.bz2_CACHE_KEY }}-install
407-
- name: Build bz2
408-
if: ${{ steps.paths.outputs.bz2_SOURCE && ! steps.restore_bz2.outputs.cache-hit }}
409-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --free-up-disk --no-tests bz2
410-
- name: Save bz2 to cache
411-
uses: actions/cache/save@v4
412-
if: ${{ steps.paths.outputs.bz2_SOURCE && ! steps.restore_bz2.outputs.cache-hit }}
413-
with:
414-
path: ${{ steps.paths.outputs.bz2_INSTALL }}
415-
key: ${{ steps.paths.outputs.bz2_CACHE_KEY }}-install
416388
- name: Restore openssl from cache
417389
id: restore_openssl
418390
if: ${{ steps.paths.outputs.openssl_SOURCE }}
@@ -605,54 +577,6 @@ jobs:
605577
with:
606578
path: ${{ steps.paths.outputs.mvfst_INSTALL }}
607579
key: ${{ steps.paths.outputs.mvfst_CACHE_KEY }}-install
608-
- name: Restore libffi from cache
609-
id: restore_libffi
610-
if: ${{ steps.paths.outputs.libffi_SOURCE }}
611-
uses: actions/cache/restore@v4
612-
with:
613-
path: ${{ steps.paths.outputs.libffi_INSTALL }}
614-
key: ${{ steps.paths.outputs.libffi_CACHE_KEY }}-install
615-
- name: Build libffi
616-
if: ${{ steps.paths.outputs.libffi_SOURCE && ! steps.restore_libffi.outputs.cache-hit }}
617-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --free-up-disk --no-tests libffi
618-
- name: Save libffi to cache
619-
uses: actions/cache/save@v4
620-
if: ${{ steps.paths.outputs.libffi_SOURCE && ! steps.restore_libffi.outputs.cache-hit }}
621-
with:
622-
path: ${{ steps.paths.outputs.libffi_INSTALL }}
623-
key: ${{ steps.paths.outputs.libffi_CACHE_KEY }}-install
624-
- name: Restore ncurses from cache
625-
id: restore_ncurses
626-
if: ${{ steps.paths.outputs.ncurses_SOURCE }}
627-
uses: actions/cache/restore@v4
628-
with:
629-
path: ${{ steps.paths.outputs.ncurses_INSTALL }}
630-
key: ${{ steps.paths.outputs.ncurses_CACHE_KEY }}-install
631-
- name: Build ncurses
632-
if: ${{ steps.paths.outputs.ncurses_SOURCE && ! steps.restore_ncurses.outputs.cache-hit }}
633-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --free-up-disk --no-tests ncurses
634-
- name: Save ncurses to cache
635-
uses: actions/cache/save@v4
636-
if: ${{ steps.paths.outputs.ncurses_SOURCE && ! steps.restore_ncurses.outputs.cache-hit }}
637-
with:
638-
path: ${{ steps.paths.outputs.ncurses_INSTALL }}
639-
key: ${{ steps.paths.outputs.ncurses_CACHE_KEY }}-install
640-
- name: Restore python from cache
641-
id: restore_python
642-
if: ${{ steps.paths.outputs.python_SOURCE }}
643-
uses: actions/cache/restore@v4
644-
with:
645-
path: ${{ steps.paths.outputs.python_INSTALL }}
646-
key: ${{ steps.paths.outputs.python_CACHE_KEY }}-install
647-
- name: Build python
648-
if: ${{ steps.paths.outputs.python_SOURCE && ! steps.restore_python.outputs.cache-hit }}
649-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --free-up-disk --no-tests python
650-
- name: Save python to cache
651-
uses: actions/cache/save@v4
652-
if: ${{ steps.paths.outputs.python_SOURCE && ! steps.restore_python.outputs.cache-hit }}
653-
with:
654-
path: ${{ steps.paths.outputs.python_INSTALL }}
655-
key: ${{ steps.paths.outputs.python_CACHE_KEY }}-install
656580
- name: Restore wangle from cache
657581
id: restore_wangle
658582
if: ${{ steps.paths.outputs.wangle_SOURCE }}

‎build/fbcode_builder/getdeps/builder.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1381,7 +1381,7 @@ def _build(self, reconfigure) -> None:
13811381
copy_if_different(src, dest)
13821382

13831383
cmake_lists = """
1384-
cmake_minimum_required(VERSION 3.1.3 FATAL_ERROR)
1384+
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
13851385
project(sqlite3 C)
13861386
add_library(sqlite3 STATIC sqlite3.c)
13871387
# These options are taken from the defaults in Makefile.msc in

0 commit comments

Comments
 (0)