From 8128e67d759f746c1aa9c39ba07d465f45f9cd31 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Thu, 25 Aug 2022 09:49:40 -0700 Subject: [PATCH 1/4] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 40 +++++++++++++++++++- .github/workflows/release.yml | 61 +++++++++++++++--------------- 2 files changed, 70 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 278be10b890..1918ad8e4e8 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -16,8 +16,17 @@ jobs: release_version: ${{ steps.get_release_version.outputs.release_version }} version_without_prefix: ${{ steps.get_release_version_without_prefix.outputs.version_without_prefix }} highest_semver_tag: ${{ steps.get_highest_semver.outputs.highest_semver_tag }} + current_version: ${{ steps.check_output.outputs.current_version }} + next_version: ${{ steps.check_output.outputs.next_version }} steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v2 + with: + persist-credentials: false + - name: Setup Node.js + uses: actions/setup-node@v2 + with: + node-version: '16' - name: Get release version id: get_release_version run: echo ::set-output name=release_version::${GITHUB_REF#refs/*/} @@ -38,6 +47,7 @@ jobs: echo ::set-output name=highest_semver_tag::$(get_tag_release -m) fi - name: Check output + id: check_output env: RELEASE_VERSION: ${{ steps.get_release_version.outputs.release_version }} VERSION_WITHOUT_PREFIX: ${{ steps.get_release_version_without_prefix.outputs.version_without_prefix }} @@ -46,9 +56,37 @@ jobs: echo $RELEASE_VERSION echo $VERSION_WITHOUT_PREFIX echo $HIGHEST_SEMVER_TAG + CURRENT_VERSION=$(npx -p @semantic-release/changelog -p @semantic-release/git -p @semantic-release/exec -p semantic-release semantic-release --dry-run | grep "associated with version " | sed -E 's/.* version//' | sed -E 's/ on.*//') + NEXT_VERSION=$(npx -p @semantic-release/changelog -p @semantic-release/git -p @semantic-release/exec -p semantic-release semantic-release --dry-run | grep 'The next release version is' | sed -E 's/.* ([[:digit:].]+)$/\1/') + echo ::set-output name=current_version::$CURRENT_VERSION + echo ::set-output name=next_version::$NEXT_VERSION + echo "Current version is ${CURRENT_VERSION}" + echo "Next version is ${NEXT_VERSION}" + + build-web-ui-npm: + needs: get-version + runs-on: ubuntu-latest + env: + CURRENT_VERSION: ${{ needs.get-version.outputs.current_version }} + NEXT_VERSION: ${{ needs.get-version.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 build-python-wheel: name: Build wheels on ${{ matrix.os }} + needs: build-web-ui-npm runs-on: ${{ matrix.os }} strategy: matrix: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index feab7b0eef9..83eb5bcdd5f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,40 +42,41 @@ 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 + if: github.event.inputs.dry_run == 'false' + 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 From 6bcaab4a98822915e14b31379911f1f7c7835d72 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Thu, 25 Aug 2022 10:25:17 -0700 Subject: [PATCH 2/4] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 1918ad8e4e8..08f89dff7c9 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -16,8 +16,6 @@ jobs: release_version: ${{ steps.get_release_version.outputs.release_version }} version_without_prefix: ${{ steps.get_release_version_without_prefix.outputs.version_without_prefix }} highest_semver_tag: ${{ steps.get_highest_semver.outputs.highest_semver_tag }} - current_version: ${{ steps.check_output.outputs.current_version }} - next_version: ${{ steps.check_output.outputs.next_version }} steps: - name: Checkout uses: actions/checkout@v2 @@ -56,37 +54,9 @@ jobs: echo $RELEASE_VERSION echo $VERSION_WITHOUT_PREFIX echo $HIGHEST_SEMVER_TAG - CURRENT_VERSION=$(npx -p @semantic-release/changelog -p @semantic-release/git -p @semantic-release/exec -p semantic-release semantic-release --dry-run | grep "associated with version " | sed -E 's/.* version//' | sed -E 's/ on.*//') - NEXT_VERSION=$(npx -p @semantic-release/changelog -p @semantic-release/git -p @semantic-release/exec -p semantic-release semantic-release --dry-run | grep 'The next release version is' | sed -E 's/.* ([[:digit:].]+)$/\1/') - echo ::set-output name=current_version::$CURRENT_VERSION - echo ::set-output name=next_version::$NEXT_VERSION - echo "Current version is ${CURRENT_VERSION}" - echo "Next version is ${NEXT_VERSION}" - - build-web-ui-npm: - needs: get-version - runs-on: ubuntu-latest - env: - CURRENT_VERSION: ${{ needs.get-version.outputs.current_version }} - NEXT_VERSION: ${{ needs.get-version.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 build-python-wheel: name: Build wheels on ${{ matrix.os }} - needs: build-web-ui-npm runs-on: ${{ matrix.os }} strategy: matrix: From a6cd9e4f1b6cb0e96d94ad35790972122958ec3b Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Thu, 25 Aug 2022 10:27:57 -0700 Subject: [PATCH 3/4] Fix Signed-off-by: Kevin Zhang --- .github/workflows/build_wheels.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 08f89dff7c9..841f5da87b3 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -21,10 +21,6 @@ jobs: uses: actions/checkout@v2 with: persist-credentials: false - - name: Setup Node.js - uses: actions/setup-node@v2 - with: - node-version: '16' - name: Get release version id: get_release_version run: echo ::set-output name=release_version::${GITHUB_REF#refs/*/} From ac92288c6799bbd91ce09b6f1104163cc1fb1091 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Thu, 25 Aug 2022 12:08:09 -0700 Subject: [PATCH 4/4] Fix helm charts Signed-off-by: Kevin Zhang --- infra/scripts/helm/validate-helm-chart-versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/scripts/helm/validate-helm-chart-versions.sh b/infra/scripts/helm/validate-helm-chart-versions.sh index aac79d93154..17a87e163aa 100755 --- a/infra/scripts/helm/validate-helm-chart-versions.sh +++ b/infra/scripts/helm/validate-helm-chart-versions.sh @@ -3,7 +3,7 @@ set -e # Amount of file locations that need to be bumped in unison when versions increment -UNIQUE_VERSIONS_COUNT=20 +UNIQUE_VERSIONS_COUNT=21 # Change in release 0.24.0 if [ $# -ne 1 ]; then echo "Please provide a single semver version (without a \"v\" prefix) to test the repository against, e.g 0.99.0"