Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generative AI Page Designer Component #1698

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 42 additions & 37 deletions .github/workflows/nightly_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ jobs:
echo "monorepo_version_base=$version" >> "$GITHUB_ENV"
version_major=`echo "$version" | cut -d "." -f 1`
echo "monorepo_version_major=$version_major" >> "$GITHUB_ENV"
echo "nightly_version=${{ env.monorepo_version_base }}-nightly-${{ env.release_timestamp }}" ?? "$GITHUB_ENV"
# echo "nightly_version=${{ env.monorepo_version_base }}-gpt-nightly-${{ env.release_timestamp }}" ?? "$GITHUB_ENV"

- name: Get nightly version
run: echo "nightly_version=${{ env.monorepo_version_base }}-nightly-${{ env.release_timestamp }}" >> "$GITHUB_ENV"
run: echo "nightly_version=${{ env.monorepo_version_base }}-gpt-nightly-${{ env.release_timestamp }}" >> "$GITHUB_ENV"

- name: Get retail-react-app version
run: |-
version=`jq -r ".version" packages/template-retail-react-app/package.json | cut -d "-" -f 1`
echo "retail_app_version_base=$version" >> "$GITHUB_ENV"
# - name: Get retail-react-app version
# run: |-
# version=`jq -r ".version" packages/template-retail-react-app/package.json | cut -d "-" -f 1`
# echo "retail_app_version_base=$version" >> "$GITHUB_ENV"

- name: Get commerce-sdk-react version
run: |-
Expand All @@ -57,36 +57,41 @@ jobs:
git config --global user.name ${{ secrets.GIT_CONFIG_USERNAME }}
git config --global user.email ${{ secrets.GIT_CONFIG_EMAIL }}

- name: Create Release Branch
run: |-
git pull
git switch develop
git switch nightly-releases || git switch -c nightly-releases
# - name: Create Release Branch
# run: |-
# git pull
# git switch develop
# git switch nightly-releases || git switch -c nightly-releases

# Pull all changes from develop and keep changes from develop in case of merge-conflicts
- name: Pull latest changes from develop
run: |-
git switch develop
git merge -s ours nightly-releases
git switch nightly-releases
git merge develop
# - name: Pull latest changes from develop
# run: |-
# git switch develop
# git merge -s ours nightly-releases
# git switch nightly-releases
# git merge develop

- name: Bump version (monorepo)
run: |-
npm run bump-version -- "${{ env.nightly_version }}"
# - name: Bump version (monorepo)
# run: |-
# npm run bump-version -- "${{ env.nightly_version }}"

- name: Bump version (retail-react-app)
run: |-
npm run bump-version:retail-react-app -- "${{ env.retail_app_version_base }}-nightly-${{ env.release_timestamp }}"
# - name: Bump version (retail-react-app)
# run: |-
# npm run bump-version:retail-react-app -- "${{ env.retail_app_version_base }}-nightly-${{ env.release_timestamp }}"

- name: Bump version (commerce-sdk-react)
run: |-
npm run bump-version:commerce-sdk-react -- "${{ env.commerce_sdk_react_version_base }}-nightly-${{ env.release_timestamp }}"
npm run bump-version:commerce-sdk-react -- "${{ env.commerce_sdk_react_version_base }}-gpt-nightly-${{ env.release_timestamp }}"

# - name: Push version changes to origin
# run: |-
# git commit -am "Release ${{ env.nightly_version }}"
# git push --set-upstream origin nightly-releases


- name: Push version changes to origin
- name: Commit changes so lerna doesn't complain
run: |-
git commit -am "Release ${{ env.nightly_version }}"
git push --set-upstream origin nightly-releases

- name: Check Repository Clean
uses: "./.github/actions/check_clean"
Expand All @@ -101,16 +106,16 @@ jobs:
git tag v${{ env.nightly_version }}
git push origin --tags

- name: Send GitHub Action data to Slack workflow (Generated)
id: slack-success
uses: slackapi/slack-github-action@v1.23.0
with:
payload: |
{
"message": "Successfully released PWA Kit v${{ env.nightly_version }}"
}
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
# - name: Send GitHub Action data to Slack workflow (Generated)
# id: slack-success
# uses: slackapi/slack-github-action@v1.23.0
# with:
# payload: |
# {
# "message": "Successfully released PWA Kit v${{ env.nightly_version }}"
# }
# env:
# SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

- name: Send GitHub Action data to Slack workflow (Generated)
id: slack-failure
Expand All @@ -119,7 +124,7 @@ jobs:
with:
payload: |
{
"message": "Failed to release PWA Kit v${{ env.monorepo_version_base }}-nightly-${{ env.release_timestamp }} (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
"message": "Failed to release commerce-sdk-react Generative AI nightly build v${{ env.monorepo_version_base }}-gpt-nightly-${{ env.release_timestamp }} (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
}
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
128 changes: 0 additions & 128 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading