From 753ee946a2bf50f8adf59c24b11bfe32deab380d Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 10:03:02 -0700 Subject: [PATCH 1/5] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 4dcc17927f6..4a656c7e345 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -86,6 +86,8 @@ jobs: env: CIBW_BUILD: "cp310-macosx_x86_64" CIBW_ARCHS: "native" + CIBW_ENVIRONMENT: > + _PYTHON_HOST_PLATFORM=macosx-10.15-x86_64 - uses: actions/upload-artifact@v2 with: name: wheels From dd4a1d756f27e54cbdfd650fecbf3bd017ede608 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 10:39:41 -0700 Subject: [PATCH 2/5] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 4a656c7e345..35bfc53b6c3 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -88,6 +88,9 @@ jobs: CIBW_ARCHS: "native" CIBW_ENVIRONMENT: > _PYTHON_HOST_PLATFORM=macosx-10.15-x86_64 + CIBW_BEFORE_BUILD: | + git status + git restore go.mod go.sum - uses: actions/upload-artifact@v2 with: name: wheels From b1387dd0dcea2623601156f96d8c689a915b3f79 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 10:44:09 -0700 Subject: [PATCH 3/5] Test Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 35bfc53b6c3..2d0c2f5a3cb 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -56,29 +56,29 @@ jobs: registry-url: 'https://registry.npmjs.org' - name: Build UI run: make build-ui - - name: Build wheels - uses: pypa/cibuildwheel@v2.7.0 - env: - CIBW_BUILD: "cp3*_x86_64" - CIBW_SKIP: "cp36-* *-musllinux_x86_64 cp310-macosx_x86_64" - CIBW_ARCHS: "native" - CIBW_ENVIRONMENT: > - COMPILE_GO=True PATH=$PATH:/usr/local/go/bin - CIBW_BEFORE_ALL_LINUX: | - curl -o go.tar.gz https://dl.google.com/go/go1.18.2.linux-amd64.tar.gz - tar -C /usr/local -xzf go.tar.gz - go version - CIBW_BEFORE_ALL_MACOS: | - curl -o python.pkg https://www.python.org/ftp/python/3.9.12/python-3.9.12-macosx10.9.pkg - sudo installer -pkg python.pkg -target / - # There's a `git restore` in here because `make install-go-ci-dependencies` is actually messing up go.mod & go.sum. - CIBW_BEFORE_BUILD: | - make install-protoc-dependencies - make install-go-proto-dependencies - make install-go-ci-dependencies - git status - git restore go.mod go.sum - CIBW_BEFORE_TEST: "cd {project} && git status" + # - name: Build wheels + # uses: pypa/cibuildwheel@v2.7.0 + # env: + # CIBW_BUILD: "cp3*_x86_64" + # CIBW_SKIP: "cp36-* *-musllinux_x86_64 cp310-macosx_x86_64" + # CIBW_ARCHS: "native" + # CIBW_ENVIRONMENT: > + # COMPILE_GO=True PATH=$PATH:/usr/local/go/bin + # CIBW_BEFORE_ALL_LINUX: | + # curl -o go.tar.gz https://dl.google.com/go/go1.18.2.linux-amd64.tar.gz + # tar -C /usr/local -xzf go.tar.gz + # go version + # CIBW_BEFORE_ALL_MACOS: | + # curl -o python.pkg https://www.python.org/ftp/python/3.9.12/python-3.9.12-macosx10.9.pkg + # sudo installer -pkg python.pkg -target / + # # There's a `git restore` in here because `make install-go-ci-dependencies` is actually messing up go.mod & go.sum. + # CIBW_BEFORE_BUILD: | + # make install-protoc-dependencies + # make install-go-proto-dependencies + # make install-go-ci-dependencies + # git status + # git restore go.mod go.sum + # CIBW_BEFORE_TEST: "cd {project} && git status" # py3.10 on MacOS does not work with Go so we have to install separately. Issue is tracked here: https://github.com/feast-dev/feast/issues/2881. - name: Build py310 specific wheels for macos if: matrix.os == 'macos-10.15' From d86cc3f4423f7aa105d483e6285060330864b913 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 11:25:29 -0700 Subject: [PATCH 4/5] fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 2d0c2f5a3cb..35bfc53b6c3 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -56,29 +56,29 @@ jobs: registry-url: 'https://registry.npmjs.org' - name: Build UI run: make build-ui - # - name: Build wheels - # uses: pypa/cibuildwheel@v2.7.0 - # env: - # CIBW_BUILD: "cp3*_x86_64" - # CIBW_SKIP: "cp36-* *-musllinux_x86_64 cp310-macosx_x86_64" - # CIBW_ARCHS: "native" - # CIBW_ENVIRONMENT: > - # COMPILE_GO=True PATH=$PATH:/usr/local/go/bin - # CIBW_BEFORE_ALL_LINUX: | - # curl -o go.tar.gz https://dl.google.com/go/go1.18.2.linux-amd64.tar.gz - # tar -C /usr/local -xzf go.tar.gz - # go version - # CIBW_BEFORE_ALL_MACOS: | - # curl -o python.pkg https://www.python.org/ftp/python/3.9.12/python-3.9.12-macosx10.9.pkg - # sudo installer -pkg python.pkg -target / - # # There's a `git restore` in here because `make install-go-ci-dependencies` is actually messing up go.mod & go.sum. - # CIBW_BEFORE_BUILD: | - # make install-protoc-dependencies - # make install-go-proto-dependencies - # make install-go-ci-dependencies - # git status - # git restore go.mod go.sum - # CIBW_BEFORE_TEST: "cd {project} && git status" + - name: Build wheels + uses: pypa/cibuildwheel@v2.7.0 + env: + CIBW_BUILD: "cp3*_x86_64" + CIBW_SKIP: "cp36-* *-musllinux_x86_64 cp310-macosx_x86_64" + CIBW_ARCHS: "native" + CIBW_ENVIRONMENT: > + COMPILE_GO=True PATH=$PATH:/usr/local/go/bin + CIBW_BEFORE_ALL_LINUX: | + curl -o go.tar.gz https://dl.google.com/go/go1.18.2.linux-amd64.tar.gz + tar -C /usr/local -xzf go.tar.gz + go version + CIBW_BEFORE_ALL_MACOS: | + curl -o python.pkg https://www.python.org/ftp/python/3.9.12/python-3.9.12-macosx10.9.pkg + sudo installer -pkg python.pkg -target / + # There's a `git restore` in here because `make install-go-ci-dependencies` is actually messing up go.mod & go.sum. + CIBW_BEFORE_BUILD: | + make install-protoc-dependencies + make install-go-proto-dependencies + make install-go-ci-dependencies + git status + git restore go.mod go.sum + CIBW_BEFORE_TEST: "cd {project} && git status" # py3.10 on MacOS does not work with Go so we have to install separately. Issue is tracked here: https://github.com/feast-dev/feast/issues/2881. - name: Build py310 specific wheels for macos if: matrix.os == 'macos-10.15' From b1e9041444399d4367fc82e5726fa871be55f69e Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 29 Jun 2022 11:37:04 -0700 Subject: [PATCH 5/5] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 35bfc53b6c3..6ee866781dc 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -86,8 +86,10 @@ jobs: env: CIBW_BUILD: "cp310-macosx_x86_64" CIBW_ARCHS: "native" + # Need this environment variable because of this issue: https://github.com/pypa/cibuildwheel/issues/952. CIBW_ENVIRONMENT: > _PYTHON_HOST_PLATFORM=macosx-10.15-x86_64 + # There's a `git restore` in here because remnant go.mod, go.sum changes from the build mess up the wheel naming. CIBW_BEFORE_BUILD: | git status git restore go.mod go.sum