Skip to content

Commit ae407fe

Browse files
jbower-fbfacebook-github-bot
authored andcommitted
Must not have '.' in manifest names as this breaks GitHub actions generation
Summary: There are probably some other rules too, although this is the only one I know of. Reviewed By: martindemello Differential Revision: D79474227 fbshipit-source-id: 175f266cb43f671da241e2d2ca289328b9e413d0
1 parent 82221c6 commit ae407fe

4 files changed

Lines changed: 30 additions & 25 deletions

File tree

.github/workflows/getdeps_linux.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v4
2121
- id: paths
2222
name: Query paths
23-
run: python3 build/fbcode_builder/getdeps.py query-paths --recursive --src-dir=. cinderx-3.12mp >> "$GITHUB_OUTPUT"
23+
run: python3 build/fbcode_builder/getdeps.py query-paths --recursive --src-dir=. cinderx-3_12mp >> "$GITHUB_OUTPUT"
2424
- name: Fetch ninja
2525
if: ${{ steps.paths.outputs.ninja_SOURCE }}
2626
run: python3 build/fbcode_builder/getdeps.py fetch --no-tests ninja
@@ -39,9 +39,9 @@ jobs:
3939
- name: Fetch libtool
4040
if: ${{ steps.paths.outputs.libtool_SOURCE }}
4141
run: python3 build/fbcode_builder/getdeps.py fetch --no-tests libtool
42-
- name: Fetch meta-python-3.12
43-
if: ${{ steps.paths.outputs.meta-python-3.12_SOURCE }}
44-
run: python3 build/fbcode_builder/getdeps.py fetch --no-tests meta-python-3.12
42+
- name: Fetch meta-python-3_12
43+
if: ${{ steps.paths.outputs.meta-python-3_12_SOURCE }}
44+
run: python3 build/fbcode_builder/getdeps.py fetch --no-tests meta-python-3_12
4545
- name: Restore ninja from cache
4646
id: restore_ninja
4747
if: ${{ steps.paths.outputs.ninja_SOURCE }}
@@ -138,29 +138,29 @@ jobs:
138138
with:
139139
path: ${{ steps.paths.outputs.libtool_INSTALL }}
140140
key: ${{ steps.paths.outputs.libtool_CACHE_KEY }}-install
141-
- name: Restore meta-python-3.12 from cache
142-
id: restore_meta-python-3.12
143-
if: ${{ steps.paths.outputs.meta-python-3.12_SOURCE }}
141+
- name: Restore meta-python-3_12 from cache
142+
id: restore_meta-python-3_12
143+
if: ${{ steps.paths.outputs.meta-python-3_12_SOURCE }}
144144
uses: actions/cache/restore@v4
145145
with:
146-
path: ${{ steps.paths.outputs.meta-python-3.12_INSTALL }}
147-
key: ${{ steps.paths.outputs.meta-python-3.12_CACHE_KEY }}-install
148-
- name: Build meta-python-3.12
149-
if: ${{ steps.paths.outputs.meta-python-3.12_SOURCE && ! steps.restore_meta-python-3.12.outputs.cache-hit }}
150-
run: python3 build/fbcode_builder/getdeps.py build --no-tests meta-python-3.12
151-
- name: Save meta-python-3.12 to cache
146+
path: ${{ steps.paths.outputs.meta-python-3_12_INSTALL }}
147+
key: ${{ steps.paths.outputs.meta-python-3_12_CACHE_KEY }}-install
148+
- name: Build meta-python-3_12
149+
if: ${{ steps.paths.outputs.meta-python-3_12_SOURCE && ! steps.restore_meta-python-3_12.outputs.cache-hit }}
150+
run: python3 build/fbcode_builder/getdeps.py build --no-tests meta-python-3_12
151+
- name: Save meta-python-3_12 to cache
152152
uses: actions/cache/save@v4
153-
if: ${{ steps.paths.outputs.meta-python-3.12_SOURCE && ! steps.restore_meta-python-3.12.outputs.cache-hit }}
153+
if: ${{ steps.paths.outputs.meta-python-3_12_SOURCE && ! steps.restore_meta-python-3_12.outputs.cache-hit }}
154154
with:
155-
path: ${{ steps.paths.outputs.meta-python-3.12_INSTALL }}
156-
key: ${{ steps.paths.outputs.meta-python-3.12_CACHE_KEY }}-install
157-
- name: Build cinderx-3.12mp
158-
run: python3 build/fbcode_builder/getdeps.py build --src-dir=. cinderx-3.12mp --project-install-prefix cinderx-3.12mp:/usr/local
155+
path: ${{ steps.paths.outputs.meta-python-3_12_INSTALL }}
156+
key: ${{ steps.paths.outputs.meta-python-3_12_CACHE_KEY }}-install
157+
- name: Build cinderx-3_12mp
158+
run: python3 build/fbcode_builder/getdeps.py build --src-dir=. cinderx-3_12mp --project-install-prefix cinderx-3_12mp:/usr/local
159159
- name: Copy artifacts
160-
run: python3 build/fbcode_builder/getdeps.py fixup-dyn-deps --strip --src-dir=. cinderx-3.12mp _artifacts/linux --project-install-prefix cinderx-3.12mp:/usr/local --final-install-prefix /usr/local
160+
run: python3 build/fbcode_builder/getdeps.py fixup-dyn-deps --strip --src-dir=. cinderx-3_12mp _artifacts/linux --project-install-prefix cinderx-3_12mp:/usr/local --final-install-prefix /usr/local
161161
- uses: actions/upload-artifact@v4
162162
with:
163-
name: cinderx-3.12mp
163+
name: cinderx-3_12mp
164164
path: _artifacts
165-
- name: Test cinderx-3.12mp
166-
run: python3 build/fbcode_builder/getdeps.py test --src-dir=. cinderx-3.12mp --project-install-prefix cinderx-3.12mp:/usr/local
165+
- name: Test cinderx-3_12mp
166+
run: python3 build/fbcode_builder/getdeps.py test --src-dir=. cinderx-3_12mp --project-install-prefix cinderx-3_12mp:/usr/local

build/fbcode_builder/getdeps/manifest.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,11 @@ def __init__(self, file_name, fp=None):
255255
% (file_name, self.name)
256256
)
257257

258+
if "." in self.name:
259+
raise Exception(
260+
f"manifest name ({self.name}) must not contain the '.' character (it is incompatible with github actions)"
261+
)
262+
258263
def get(self, section, key, defval=None, ctx=None):
259264
ctx = ctx or {}
260265

build/fbcode_builder/manifests/cinderx-3.12mp renamed to build/fbcode_builder/manifests/cinderx-3_12mp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[manifest]
2-
name = cinderx-3.12mp
2+
name = cinderx-3_12mp
33
fbsource_path = fbcode/cinderx
44
shipit_project = facebookincubator/cinderx
55

@@ -14,7 +14,7 @@ builder = nop
1414

1515
[dependencies]
1616
python-setuptools
17-
meta-python-3.12
17+
meta-python-3_12
1818

1919
[shipit.pathmap]
2020
fbcode/cinderx = cinderx

build/fbcode_builder/manifests/meta-python-3.12 renamed to build/fbcode_builder/manifests/meta-python-3_12

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This is primarily to support CinderX, so it's not heavily configured.
22

33
[manifest]
4-
name = meta-python-3.12
4+
name = meta-python-3_12
55
fbsource_path = third-party/python/3.12
66
shipit_project = facebookincubator/cinder
77
shipit_fbcode_builder = false

0 commit comments

Comments
 (0)