Skip to content

Commit

Permalink
chore: merge pull request #2905 from vuestorefront/v2-release/2.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
FRSgit authored Jul 7, 2023
2 parents 32f5396 + 66e6019 commit e0b7224
Show file tree
Hide file tree
Showing 165 changed files with 5,675 additions and 1,635 deletions.
37 changes: 0 additions & 37 deletions .github/workflows/cd-v2-publish-and-create-pr.yml

This file was deleted.

64 changes: 59 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ jobs:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_REACT }}

release-canary:
name: Release canary package
name: Release Canary packages
needs: [build, build-release, cypress-react, cypress-vue]
if: ${{ github.ref == 'refs/heads/v2-develop' }}
# Can't use 'configure-enviroment' because it fails on dev branch
Expand All @@ -207,22 +207,27 @@ jobs:
registry-url: 'https://registry.npmjs.org'
- name: Install dependencies
run: yarn --immutable
- name: Set yarn config
run: |
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
- name: Bump package version
run: yarn changeset version --snapshot
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Build package
- name: Build packages
run: yarn build:release
- name: Publish canary version
run: yarn changeset publish --tag canary
run: yarn workspaces foreach --no-private --from '@storefront-ui/*' npm publish --tag canary || true
env:
# Needs access to publish to npm
# refresh token before Saturday, May 25, 2024
NPM_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}

release-rc:
name: Release RC package
name: Release RC packages
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand All @@ -237,15 +242,64 @@ jobs:
registry-url: 'https://registry.npmjs.org'
- name: Install dependencies
run: yarn --immutable
- name: Set yarn config
run: |
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
- name: Save head commit message
id: commit_message
run: echo "result=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT
- name: Build packages
run: yarn build:release
- name: Publish release-candidate version
# If this is any `v2-release/**` branch AND last commit is made by changeset action and its commit message is with "ci: release (rc)", this happens only after merging changesets changelog PR
if: "${{ startsWith( github.event.pull_request.head.ref, 'v2-release' ) && contains( steps.commit_message.outputs.result, 'ci: version packages (rc)' ) }}"
run: yarn changeset publish
run: yarn workspaces foreach --no-private --from '@storefront-ui/*' npm publish --tag rc || true
env:
# Needs access to publish to npm
# refresh token before Saturday, May 25, 2024
NPM_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}

release-production:
name: Release Production packages
runs-on: ubuntu-latest
needs: [build, build-release, cypress-react, cypress-vue]
if: ${{ github.ref == 'refs/heads/v2' }}
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version-file: '.node-version'
cache: 'yarn'
registry-url: 'https://registry.npmjs.org'
- name: Install dependencies
run: yarn --immutable
- name: Set yarn config
run: |
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
- name: Build packages
run: yarn build:release
- name: Publish Production version package
run: yarn workspaces foreach --no-private --from '@storefront-ui/*' npm publish || true
env:
# Needs access to publish to npm
# refresh token before Saturday, May 25, 2024
NPM_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_TOKEN }}
- name: Create PR to v2-develop branch
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh pr create -B v2-develop --title 'chore: automatic sync v2->v2-develop' --body 'This Pull Request is generated automatically with changes pushed into `v2` branch. `v2` and `v2-develop` branches should be in-sync.' --label automerge || true
- name: Merge created PR
env:
GH_TOKEN: ${{ github.token }}
run: gh pr merge --auto --merge
2 changes: 1 addition & 1 deletion .vuestorefrontcloud/docs/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ server {
absolute_redirect off;

location /v2/figma {
return 307 https://www.figma.com/file/Tw5iWaLFSUrf9cBv4BQTjC/Storefront-UI-%7C-Design-Kit-v2.4-(public)?type=design&node-id=22913-91045&mode=design&t=iEaSbApU9FfvAj8S-0;
return 307 https://www.figma.com/file/Q7Nr1NvjPdcGVhykkfDg2k/Storefront-UI-%7C-Design-Kit-v2.5-(public)?type=design&node-id=22913-91045&mode=design;
}

location /v2 {
Expand Down
28 changes: 28 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Large diffs are not rendered by default.

449 changes: 225 additions & 224 deletions .yarn/releases/yarn-3.5.1.cjs → .yarn/releases/yarn-3.6.1.cjs

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.5.1.cjs
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: '@yarnpkg/plugin-workspace-tools'

yarnPath: .yarn/releases/yarn-3.6.1.cjs
170 changes: 0 additions & 170 deletions CHANGELOG.md

This file was deleted.

Loading

0 comments on commit e0b7224

Please sign in to comment.