Skip to content

Commit dbc39c5

Browse files
yongtangyongtang
authored
Split arm64 build from the other build (#1902)
1 parent d5de32d commit dbc39c5

File tree

2 files changed

+77
-82
lines changed

2 files changed

+77
-82
lines changed

‎.github/workflows/build.bazel.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ $PYTHON tools/build/configure.py
4949

5050
cat .bazelrc
5151

52-
if [[ $(uname -m) == "arm64" ]]; then
52+
if [[ $(uname -m) != "arm64" && $(uname) == "Darwin" ]]; then
5353

5454
bazel build \
5555
${BAZEL_OPTIMIZATION} \

‎.github/workflows/build.yml‎

Lines changed: 76 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -533,17 +533,9 @@ jobs:
533533
release:
534534
name: Release
535535
if: github.event_name == 'push'
536-
needs: [linux-wheel, macos-wheel, macos-arm64-wheel] #, windows-wheel]
536+
needs: [linux-wheel, macos-wheel] #, windows-wheel]
537537
runs-on: ubuntu-20.04
538538
steps:
539-
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
540-
with:
541-
name: macOS-arm64-3.7-wheel
542-
path: macOS-arm64-3.7-wheel
543-
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
544-
with:
545-
name: macOS-arm64-3.8-wheel
546-
path: macOS-arm64-3.8-wheel
547539
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
548540
with:
549541
name: macOS-arm64-3.9-wheel
@@ -556,14 +548,6 @@ jobs:
556548
with:
557549
name: macOS-arm64-3.11-wheel
558550
path: macOS-arm64-3.11-wheel
559-
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
560-
with:
561-
name: macOS-3.7-wheel
562-
path: macOS-3.7-wheel
563-
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
564-
with:
565-
name: macOS-3.8-wheel
566-
path: macOS-3.8-wheel
567551
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
568552
with:
569553
name: macOS-3.9-wheel
@@ -576,14 +560,6 @@ jobs:
576560
with:
577561
name: macOS-3.11-wheel
578562
path: macOS-3.11-wheel
579-
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
580-
with:
581-
name: Linux-3.7-wheel
582-
path: Linux-3.7-wheel
583-
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
584-
with:
585-
name: Linux-3.8-wheel
586-
path: Linux-3.8-wheel
587563
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
588564
with:
589565
name: Linux-3.9-wheel
@@ -598,14 +574,6 @@ jobs:
598574
path: Linux-3.11-wheel
599575
#- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
600576
# with:
601-
# name: Windows-3.7-wheel
602-
# path: Windows-3.7-wheel
603-
#- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
604-
# with:
605-
# name: Windows-3.8-wheel
606-
# path: Windows-3.8-wheel
607-
#- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
608-
# with:
609577
# name: Windows-3.9-wheel
610578
# path: Windows-3.9-wheel
611579
#- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
@@ -619,23 +587,15 @@ jobs:
619587
- run: |
620588
set -e -x
621589
mkdir -p wheelhouse
622-
cp macOS-arm64-3.7-wheel/*.whl wheelhouse/
623-
cp macOS-arm64-3.8-wheel/*.whl wheelhouse/
624590
cp macOS-arm64-3.9-wheel/*.whl wheelhouse/
625591
cp macOS-arm64-3.10-wheel/*.whl wheelhouse/
626592
cp macOS-arm64-3.11-wheel/*.whl wheelhouse/
627-
cp macOS-3.7-wheel/*.whl wheelhouse/
628-
cp macOS-3.8-wheel/*.whl wheelhouse/
629593
cp macOS-3.9-wheel/*.whl wheelhouse/
630594
cp macOS-3.10-wheel/*.whl wheelhouse/
631595
cp macOS-3.11-wheel/*.whl wheelhouse/
632-
cp Linux-3.7-wheel/*.whl wheelhouse/
633-
cp Linux-3.8-wheel/*.whl wheelhouse/
634596
cp Linux-3.9-wheel/*.whl wheelhouse/
635597
cp Linux-3.10-wheel/*.whl wheelhouse/
636598
cp Linux-3.11-wheel/*.whl wheelhouse/
637-
# cp Windows-3.7-wheel/*.whl wheelhouse/
638-
# cp Windows-3.8-wheel/*.whl wheelhouse/
639599
# cp Windows-3.9-wheel/*.whl wheelhouse/
640600
# cp Windows-3.10-wheel/*.whl wheelhouse/
641601
# cp Windows-3.11-wheel/*.whl wheelhouse/
@@ -646,10 +606,41 @@ jobs:
646606
name: tensorflow-io-release
647607
path: wheelhouse
648608

609+
release-macos-arm64:
610+
name: Release
611+
if: github.event_name == 'push'
612+
needs: [macos-arm64-wheel]
613+
runs-on: ubuntu-20.04
614+
steps:
615+
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
616+
with:
617+
name: macOS-arm64-3.9-wheel
618+
path: macOS-arm64-3.9-wheel
619+
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
620+
with:
621+
name: macOS-arm64-3.10-wheel
622+
path: macOS-arm64-3.10-wheel
623+
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
624+
with:
625+
name: macOS-arm64-3.11-wheel
626+
path: macOS-arm64-3.11-wheel
627+
- run: |
628+
set -e -x
629+
mkdir -p wheelhouse
630+
cp macOS-arm64-3.9-wheel/*.whl wheelhouse/
631+
cp macOS-arm64-3.10-wheel/*.whl wheelhouse/
632+
cp macOS-arm64-3.11-wheel/*.whl wheelhouse/
633+
ls -la wheelhouse/
634+
sha256sum wheelhouse/*.whl
635+
- uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
636+
with:
637+
name: tensorflow-io-release-macos-arm64
638+
path: wheelhouse
639+
649640
release-candidate:
650641
name: Release Candidate
651642
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
652-
needs: [lint, release]
643+
needs: [release]
653644
runs-on: ubuntu-20.04
654645
steps:
655646
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -686,6 +677,46 @@ jobs:
686677
push: true
687678
tags: tfsigio/candidate:${{ steps.info.outputs.version }}
688679

680+
release-candidate-macos-arm64:
681+
name: Release Candidate
682+
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
683+
needs: [release-macos-arm64]
684+
runs-on: ubuntu-20.04
685+
steps:
686+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
687+
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
688+
with:
689+
name: tensorflow-io-release-macos-arm64
690+
path: wheelhouse
691+
- run: |
692+
set -x -e
693+
sha256sum wheelhouse/*.whl | sort -u > wheelhouse.sha256
694+
git rev-parse --verify HEAD > wheelhouse.commit
695+
grep 'version = ' tensorflow_io/python/ops/version_ops.py | sed -E 's@^.*version = "@@g' | sed -E 's@".*$@@g' > wheelhouse.version
696+
cat wheelhouse.sha256
697+
cat wheelhouse.commit
698+
cat wheelhouse.version
699+
echo "::set-output name=version::$(cat wheelhouse.version)"
700+
id: info
701+
- run: |-
702+
cat <<EOF > Dockerfile
703+
FROM gcr.io/distroless/base-debian11
704+
COPY wheelhouse /wheelhouse
705+
COPY wheelhouse.sha256 /wheelhouse.sha256
706+
COPY wheelhouse.commit /wheelhouse.commit
707+
COPY wheelhouse.version /wheelhouse.version
708+
EOF
709+
- uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
710+
- uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
711+
with:
712+
username: tfsigio
713+
password: ${{ secrets.DOCKER_PASSWORD }}
714+
- uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
715+
with:
716+
context: .
717+
push: true
718+
tags: tfsigio/candidate:macos-arm64-${{ steps.info.outputs.version }}
719+
689720
docker-release:
690721
name: Docker Release
691722
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
@@ -729,7 +760,7 @@ jobs:
729760
runs-on: macOS-11
730761
strategy:
731762
matrix:
732-
python: ['3.7', '3.8', '3.9', '3.10', '3.11']
763+
python: ['3.9', '3.10', '3.11']
733764
steps:
734765
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
735766
with:
@@ -776,7 +807,7 @@ jobs:
776807
runs-on: ubuntu-20.04
777808
strategy:
778809
matrix:
779-
python: ['3.7', '3.8', '3.9', '3.10', '3.11']
810+
python: ['3.9', '3.10', '3.11']
780811
steps:
781812
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
782813
with:
@@ -816,7 +847,7 @@ jobs:
816847
runs-on: windows-latest
817848
strategy:
818849
matrix:
819-
python: ['3.7', '3.8', '3.9', '3.10', '3.11']
850+
python: ['3.9', '3.10', '3.11']
820851
steps:
821852
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
822853
with:
@@ -852,14 +883,6 @@ jobs:
852883
needs: [linux-nightly, macos-nightly, windows-nightly]
853884
runs-on: ubuntu-20.04
854885
steps:
855-
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
856-
with:
857-
name: macOS-3.7-nightly
858-
path: macOS-3.7-nightly
859-
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
860-
with:
861-
name: macOS-3.8-nightly
862-
path: macOS-3.8-nightly
863886
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
864887
with:
865888
name: macOS-3.9-nightly
@@ -872,14 +895,6 @@ jobs:
872895
with:
873896
name: macOS-3.11-nightly
874897
path: macOS-3.11-nightly
875-
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
876-
with:
877-
name: Linux-3.7-nightly
878-
path: Linux-3.7-nightly
879-
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
880-
with:
881-
name: Linux-3.8-nightly
882-
path: Linux-3.8-nightly
883898
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
884899
with:
885900
name: Linux-3.9-nightly
@@ -892,14 +907,6 @@ jobs:
892907
with:
893908
name: Linux-3.11-nightly
894909
path: Linux-3.11-nightly
895-
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
896-
with:
897-
name: Windows-3.7-nightly
898-
path: Windows-3.7-nightly
899-
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
900-
with:
901-
name: Windows-3.8-nightly
902-
path: Windows-3.8-nightly
903910
- uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
904911
with:
905912
name: Windows-3.9-nightly
@@ -915,18 +922,12 @@ jobs:
915922
- run: |
916923
set -e -x
917924
mkdir -p dist
918-
cp macOS-3.7-nightly/tensorflow_io_nightly*.whl dist/
919-
cp macOS-3.8-nightly/tensorflow_io_nightly*.whl dist/
920925
cp macOS-3.9-nightly/tensorflow_io_nightly*.whl dist/
921926
cp macOS-3.10-nightly/tensorflow_io_nightly*.whl dist/
922927
cp macOS-3.11-nightly/tensorflow_io_nightly*.whl dist/
923-
cp Linux-3.7-nightly/tensorflow_io_nightly*.whl dist/
924-
cp Linux-3.8-nightly/tensorflow_io_nightly*.whl dist/
925928
cp Linux-3.9-nightly/tensorflow_io_nightly*.whl dist/
926929
cp Linux-3.10-nightly/tensorflow_io_nightly*.whl dist/
927930
cp Linux-3.11-nightly/tensorflow_io_nightly*.whl dist/
928-
cp Windows-3.7-nightly/tensorflow_io_nightly*.whl dist/
929-
cp Windows-3.8-nightly/tensorflow_io_nightly*.whl dist/
930931
cp Windows-3.9-nightly/tensorflow_io_nightly*.whl dist/
931932
cp Windows-3.10-nightly/tensorflow_io_nightly*.whl dist/
932933
cp Windows-3.11-nightly/tensorflow_io_nightly*.whl dist/
@@ -940,18 +941,12 @@ jobs:
940941
set -e -x
941942
rm -rf dist
942943
mkdir -p dist
943-
cp macOS-3.7-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
944-
cp macOS-3.8-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
945944
cp macOS-3.9-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
946945
cp macOS-3.10-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
947946
cp macOS-3.11-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
948-
cp Linux-3.7-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
949-
cp Linux-3.8-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
950947
cp Linux-3.9-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
951948
cp Linux-3.10-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
952949
cp Linux-3.11-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
953-
cp Windows-3.7-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
954-
cp Windows-3.8-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
955950
cp Windows-3.9-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
956951
cp Windows-3.10-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/
957952
cp Windows-3.11-nightly/tensorflow_io_gcs_filesystem_nightly*.whl dist/

0 commit comments

Comments
 (0)