Skip to content

Commit 3a4043f

Browse files
ahornbyfacebook-github-bot
authored andcommitted
regenerate github actions, fix cmake 4 failure (#65)
Summary: Pull Request resolved: #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 5b42e1b commit 3a4043f

File tree

2 files changed

+1
-77
lines changed

2 files changed

+1
-77
lines changed

.github/workflows/getdeps_linux.yml

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ jobs:
7979
- name: Fetch zlib
8080
if: ${{ steps.paths.outputs.zlib_SOURCE }}
8181
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests zlib
82-
- name: Fetch bz2
83-
if: ${{ steps.paths.outputs.bz2_SOURCE }}
84-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests bz2
8582
- name: Fetch openssl
8683
if: ${{ steps.paths.outputs.openssl_SOURCE }}
8784
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests openssl
@@ -118,15 +115,6 @@ jobs:
118115
- name: Fetch mvfst
119116
if: ${{ steps.paths.outputs.mvfst_SOURCE }}
120117
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests mvfst
121-
- name: Fetch libffi
122-
if: ${{ steps.paths.outputs.libffi_SOURCE }}
123-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests libffi
124-
- name: Fetch ncurses
125-
if: ${{ steps.paths.outputs.ncurses_SOURCE }}
126-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests ncurses
127-
- name: Fetch python
128-
if: ${{ steps.paths.outputs.python_SOURCE }}
129-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests python
130118
- name: Fetch wangle
131119
if: ${{ steps.paths.outputs.wangle_SOURCE }}
132120
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages fetch --no-tests wangle
@@ -389,22 +377,6 @@ jobs:
389377
with:
390378
path: ${{ steps.paths.outputs.zlib_INSTALL }}
391379
key: ${{ steps.paths.outputs.zlib_CACHE_KEY }}-install
392-
- name: Restore bz2 from cache
393-
id: restore_bz2
394-
if: ${{ steps.paths.outputs.bz2_SOURCE }}
395-
uses: actions/cache/restore@v4
396-
with:
397-
path: ${{ steps.paths.outputs.bz2_INSTALL }}
398-
key: ${{ steps.paths.outputs.bz2_CACHE_KEY }}-install
399-
- name: Build bz2
400-
if: ${{ steps.paths.outputs.bz2_SOURCE && ! steps.restore_bz2.outputs.cache-hit }}
401-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --free-up-disk --no-tests bz2
402-
- name: Save bz2 to cache
403-
uses: actions/cache/save@v4
404-
if: ${{ steps.paths.outputs.bz2_SOURCE && ! steps.restore_bz2.outputs.cache-hit }}
405-
with:
406-
path: ${{ steps.paths.outputs.bz2_INSTALL }}
407-
key: ${{ steps.paths.outputs.bz2_CACHE_KEY }}-install
408380
- name: Restore openssl from cache
409381
id: restore_openssl
410382
if: ${{ steps.paths.outputs.openssl_SOURCE }}
@@ -597,54 +569,6 @@ jobs:
597569
with:
598570
path: ${{ steps.paths.outputs.mvfst_INSTALL }}
599571
key: ${{ steps.paths.outputs.mvfst_CACHE_KEY }}-install
600-
- name: Restore libffi from cache
601-
id: restore_libffi
602-
if: ${{ steps.paths.outputs.libffi_SOURCE }}
603-
uses: actions/cache/restore@v4
604-
with:
605-
path: ${{ steps.paths.outputs.libffi_INSTALL }}
606-
key: ${{ steps.paths.outputs.libffi_CACHE_KEY }}-install
607-
- name: Build libffi
608-
if: ${{ steps.paths.outputs.libffi_SOURCE && ! steps.restore_libffi.outputs.cache-hit }}
609-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --free-up-disk --no-tests libffi
610-
- name: Save libffi to cache
611-
uses: actions/cache/save@v4
612-
if: ${{ steps.paths.outputs.libffi_SOURCE && ! steps.restore_libffi.outputs.cache-hit }}
613-
with:
614-
path: ${{ steps.paths.outputs.libffi_INSTALL }}
615-
key: ${{ steps.paths.outputs.libffi_CACHE_KEY }}-install
616-
- name: Restore ncurses from cache
617-
id: restore_ncurses
618-
if: ${{ steps.paths.outputs.ncurses_SOURCE }}
619-
uses: actions/cache/restore@v4
620-
with:
621-
path: ${{ steps.paths.outputs.ncurses_INSTALL }}
622-
key: ${{ steps.paths.outputs.ncurses_CACHE_KEY }}-install
623-
- name: Build ncurses
624-
if: ${{ steps.paths.outputs.ncurses_SOURCE && ! steps.restore_ncurses.outputs.cache-hit }}
625-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --free-up-disk --no-tests ncurses
626-
- name: Save ncurses to cache
627-
uses: actions/cache/save@v4
628-
if: ${{ steps.paths.outputs.ncurses_SOURCE && ! steps.restore_ncurses.outputs.cache-hit }}
629-
with:
630-
path: ${{ steps.paths.outputs.ncurses_INSTALL }}
631-
key: ${{ steps.paths.outputs.ncurses_CACHE_KEY }}-install
632-
- name: Restore python from cache
633-
id: restore_python
634-
if: ${{ steps.paths.outputs.python_SOURCE }}
635-
uses: actions/cache/restore@v4
636-
with:
637-
path: ${{ steps.paths.outputs.python_INSTALL }}
638-
key: ${{ steps.paths.outputs.python_CACHE_KEY }}-install
639-
- name: Build python
640-
if: ${{ steps.paths.outputs.python_SOURCE && ! steps.restore_python.outputs.cache-hit }}
641-
run: python3 build/fbcode_builder/getdeps.py --allow-system-packages build --free-up-disk --no-tests python
642-
- name: Save python to cache
643-
uses: actions/cache/save@v4
644-
if: ${{ steps.paths.outputs.python_SOURCE && ! steps.restore_python.outputs.cache-hit }}
645-
with:
646-
path: ${{ steps.paths.outputs.python_INSTALL }}
647-
key: ${{ steps.paths.outputs.python_CACHE_KEY }}-install
648572
- name: Restore wangle from cache
649573
id: restore_wangle
650574
if: ${{ steps.paths.outputs.wangle_SOURCE }}

build/fbcode_builder/getdeps/builder.py

Lines changed: 1 addition & 1 deletion
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)