From 504b5cb8324c77ffbabf473073babe01d36625fe Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 24 Aug 2022 14:37:59 -0700 Subject: [PATCH 1/6] Fix Signed-off-by: Kevin Zhang --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dbe006d4c2f..548e3afda18 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -92,10 +92,10 @@ jobs: with: node-version: '16' - name: Release (Dry Run) - if: github.event.inputs.dry_run == 'true' + if: github.event.inputs.dry_run == 'true' && always() # Temporary fix to make sure the release runs run: | npx -p @semantic-release/changelog -p @semantic-release/git -p @semantic-release/exec -p semantic-release semantic-release --dry-run - name: Release - if: github.event.inputs.dry_run == 'false' + if: github.event.inputs.dry_run == 'false' && run: | npx -p @semantic-release/changelog -p @semantic-release/git -p @semantic-release/exec -p semantic-release semantic-release From 32d40f1f4d27e086b04ee64eaf5870a567d39154 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 24 Aug 2022 14:39:40 -0700 Subject: [PATCH 2/6] fix Signed-off-by: Kevin Zhang --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 548e3afda18..65ac30a2597 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -92,10 +92,10 @@ jobs: with: node-version: '16' - name: Release (Dry Run) - if: github.event.inputs.dry_run == 'true' && always() # Temporary fix to make sure the release runs + if: github.event.inputs.dry_run == 'true' run: | npx -p @semantic-release/changelog -p @semantic-release/git -p @semantic-release/exec -p semantic-release semantic-release --dry-run - name: Release - if: github.event.inputs.dry_run == 'false' && + if: github.event.inputs.dry_run == 'false' && always() # Temporary fix to make sure the release runs run: | npx -p @semantic-release/changelog -p @semantic-release/git -p @semantic-release/exec -p semantic-release semantic-release From 9bfe931ea7add72f965112cbc27df54e1d8a8e2c Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 24 Aug 2022 20:53:10 -0700 Subject: [PATCH 3/6] temporary fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 1 + .github/workflows/release.yml | 62 +++++++++++++++--------------- 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index c47a8ec5c3d..ae676ad8a63 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -89,6 +89,7 @@ jobs: make install-go-ci-dependencies git status git restore go.mod go.sum + git restore sdk/ 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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 65ac30a2597..feab7b0eef9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,40 +42,40 @@ jobs: echo "Current version is ${CURRENT_VERSION}" echo "Next version is ${NEXT_VERSION}" - publish-web-ui-npm: - if: github.repository == 'feast-dev/feast' - needs: get_dry_release_versions - runs-on: ubuntu-latest - env: - # This publish is working using an NPM automation token to bypass 2FA - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - CURRENT_VERSION: ${{ needs.get_dry_release_versions.outputs.current_version }} - NEXT_VERSION: ${{ needs.get_dry_release_versions.outputs.next_version }} - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: '17.x' - registry-url: 'https://registry.npmjs.org' - - name: Bump file versions (temporarily for Web UI publish) - run: python ./infra/scripts/release/bump_file_versions.py ${CURRENT_VERSION} ${NEXT_VERSION} - - name: Install yarn dependencies - working-directory: ./ui - run: yarn install - - name: Build yarn rollup - working-directory: ./ui - run: yarn build:lib - - name: Publish UI package - working-directory: ./ui - run: npm publish - env: - # This publish is working using an NPM automation token to bypass 2FA - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + # publish-web-ui-npm: + # if: github.repository == 'feast-dev/feast' + # needs: get_dry_release_versions + # runs-on: ubuntu-latest + # env: + # # This publish is working using an NPM automation token to bypass 2FA + # NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + # CURRENT_VERSION: ${{ needs.get_dry_release_versions.outputs.current_version }} + # NEXT_VERSION: ${{ needs.get_dry_release_versions.outputs.next_version }} + # steps: + # - uses: actions/checkout@v2 + # - uses: actions/setup-node@v2 + # with: + # node-version: '17.x' + # registry-url: 'https://registry.npmjs.org' + # - name: Bump file versions (temporarily for Web UI publish) + # run: python ./infra/scripts/release/bump_file_versions.py ${CURRENT_VERSION} ${NEXT_VERSION} + # - name: Install yarn dependencies + # working-directory: ./ui + # run: yarn install + # - name: Build yarn rollup + # working-directory: ./ui + # run: yarn build:lib + # - name: Publish UI package + # working-directory: ./ui + # run: npm publish + # env: + # # This publish is working using an NPM automation token to bypass 2FA + # NPM_TOKEN: ${{ secrets.NPM_TOKEN }} release: name: release runs-on: ubuntu-latest - needs: publish-web-ui-npm + #needs: publish-web-ui-npm env: GITHUB_TOKEN: ${{ github.event.inputs.token }} GIT_AUTHOR_NAME: feast-ci-bot @@ -96,6 +96,6 @@ jobs: run: | npx -p @semantic-release/changelog -p @semantic-release/git -p @semantic-release/exec -p semantic-release semantic-release --dry-run - name: Release - if: github.event.inputs.dry_run == 'false' && always() # Temporary fix to make sure the release runs + if: github.event.inputs.dry_run == 'false' run: | npx -p @semantic-release/changelog -p @semantic-release/git -p @semantic-release/exec -p semantic-release semantic-release From dca542e801e0b85eac89aa4773f2dbfe97b26492 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 24 Aug 2022 21:02:22 -0700 Subject: [PATCH 4/6] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index ae676ad8a63..5a127605a34 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -89,7 +89,7 @@ jobs: make install-go-ci-dependencies git status git restore go.mod go.sum - git restore sdk/ + git restore sdk/python/feast/ui/yarn.lock 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 @@ -105,6 +105,7 @@ jobs: CIBW_BEFORE_BUILD: | git status git restore go.mod go.sum + git restore sdk/python/feast/ui/yarn.lock brew install apache-arrow - uses: actions/upload-artifact@v2 with: From 13f83648ecd2c24d7b19d95a50f1a94f6c988212 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 24 Aug 2022 21:08:17 -0700 Subject: [PATCH 5/6] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 5a127605a34..52eb22c05de 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -138,6 +138,7 @@ jobs: make build-ui git status git restore go.mod go.sum + git restore sdk/python/feast/ui/yarn.lock - name: Build run: | python3 setup.py sdist From 37396b7a09390d4c9d3bb440c6c65d82e359efc7 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 24 Aug 2022 22:02:13 -0700 Subject: [PATCH 6/6] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 52eb22c05de..278be10b890 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -235,7 +235,7 @@ jobs: - name: Smoke test run: | feast init test_repo - cd test_repo/ + cd test_repo/feature_repo feast apply echo "$TEST_SCRIPT" > run-and-wait.sh bash run-and-wait.sh feast serve @@ -244,7 +244,7 @@ jobs: - name: Smoke test with go if: matrix.python-version != '3.10' || matrix.os == 'ubuntu-latest' run: | - cd test_repo/ + cd test_repo/feature_repo feast apply echo "$TEST_SCRIPT" > run-and-wait.sh pip install cffi