Skip to content

Commit 4baf81c

Browse files
committed
Address review comments
1 parent b485d4f commit 4baf81c

File tree

7 files changed

+20
-30
lines changed

7 files changed

+20
-30
lines changed

.github/reusable-build/action.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ inputs:
77
runs:
88
using: 'composite'
99
steps:
10-
- name: Build the package for Python ${{ inputs.python-version }}
11-
shell: bash
12-
run: |
13-
docker compose build --build-arg PYTHON_VERSION=${{ inputs.python-version }} manylinux2014
14-
docker compose run -e TF_VERSION=RELEASED_TF_2 manylinux2014
15-
bazel build -c opt struct2tensor:struct2tensor_kernels_and_ops
10+
- name: Build the package for Python ${{ inputs.python-version }}
11+
shell: bash
12+
run: |
13+
docker compose build --build-arg PYTHON_VERSION=${{ inputs.python-version }} manylinux2014
14+
docker compose run -e TF_VERSION=RELEASED_TF_2 manylinux2014
1615
17-
- name: Upload wheel artifact for Python ${{ inputs.python-version }}
18-
uses: actions/upload-artifact@v4
19-
with:
20-
name: ml-metadata-wheel-py${{ inputs.python-version }}
21-
path: dist/*.whl
16+
- name: Upload wheel artifact for Python ${{ inputs.python-version }}
17+
uses: actions/upload-artifact@v4
18+
with:
19+
name: ml-metadata-wheel-py${{ inputs.python-version }}
20+
path: dist/*.whl

.github/workflows/build.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,25 @@ jobs:
1717
- name: Checkout
1818
uses: actions/checkout@v4
1919

20-
- name: Build package
21-
id: build-package
22-
uses: ./.github/reusable-build
20+
- name: Set up Python ${{ matrix.python-version }}
21+
uses: actions/setup-python@v5
2322
with:
2423
python-version: ${{ matrix.python-version }}
2524

26-
- name: Retrieve wheels
27-
uses: actions/download-artifact@v4
28-
with:
29-
merge-multiple: true
30-
path: wheels
31-
32-
- name: Set up Python ${{ matrix.python-version }}
33-
uses: actions/setup-python@v5
25+
- name: Build package
26+
id: build-package
27+
uses: ./.github/reusable-build
3428
with:
3529
python-version: ${{ matrix.python-version }}
3630

3731
- name: List and check wheels
3832
shell: bash
3933
run: |
34+
# Pin transitive dependency on pkginfo until https://github.com/pypa/twine/issues/1070 is
35+
# fixed
4036
pip install twine pkginfo>=1.10.0
41-
${{ matrix.ls || 'ls -lh' }} wheels/
42-
twine check wheels/*
43-
37+
${{ matrix.ls || 'ls -lh' }} dist/
38+
twine check dist/*
4439
4540
upload_to_pypi:
4641
name: Upload to PyPI
@@ -64,6 +59,6 @@ jobs:
6459
ls -lAs wheels/
6560
6661
- name: Upload to PyPI
67-
uses: pypa/gh-action-pypi-publish@release/v1.9
62+
uses: pypa/gh-action-pypi-publish@release/v1
6863
with:
6964
packages_dir: wheels/

bazel-bin

Lines changed: 0 additions & 1 deletion
This file was deleted.

bazel-out

Lines changed: 0 additions & 1 deletion
This file was deleted.

bazel-struct2tensor

Lines changed: 0 additions & 1 deletion
This file was deleted.

bazel-testlogs

Lines changed: 0 additions & 1 deletion
This file was deleted.
-1.83 MB
Binary file not shown.

0 commit comments

Comments
 (0)