Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into cypress-demo
Browse files Browse the repository at this point in the history
  • Loading branch information
Nayden Naydenov committed May 7, 2024
2 parents 02967f3 + 7a0e84e commit ab2e01c
Show file tree
Hide file tree
Showing 1,593 changed files with 38,651 additions and 37,602 deletions.
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ charset = utf-8
[*.{css,html,java,js,json,less,txt,ts}]
trim_trailing_whitespace = true
end_of_line = lf
indent_style = tab
tab_width = 4

[pom.xml]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
suite: ['base', 'main:suite-1', 'main:suite-2', 'fiori']
suite: ['base', 'compat', 'main:suite-1', 'main:suite-2', 'fiori']
steps:
- uses: actions/checkout@v4

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
name: Deploy Storybook [on latest release]
name: Deploy Storybook [manual]

on:
release:
types:
- 'released'
workflow_dispatch:

inputs:
targetFolder:
description: 'target folder'
required: true
default: 'storybook'
jobs:
deploy:
runs-on: ubuntu-latest
Expand All @@ -23,13 +24,10 @@ jobs:
yarn install
yarn ci:deploybuild
- name: Write version.md
run: git log -1 &>> packages/playground/dist/version.md

- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4.3.3
with:
branch: gh-pages # The branch the action should deploy to.
folder: packages/playground/dist # The folder the action should deploy.
target-folder: storybook-latest
folder: packages/playground/dist/playground # The folder the action should deploy.
target-folder: ${{ github.event.inputs.targetFolder }}
clean: true
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: Deploy Storybook [manual]
name: Deploy Storybook [on-nighlty-schedule]

on:
workflow_dispatch:
schedule:
- cron: "00 17 * * *"

jobs:
deploy:
Expand Down
41 changes: 41 additions & 0 deletions .github/workflows/deploy-website-manually.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Deploy Website [manual]

on:
workflow_dispatch:
inputs:
targetFolder:
description: 'target folder'
required: true
default: 'nightly'
jobs:
deploy:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4.0.1
with:
node-version: 18
cache: 'yarn'

- name: Install and Build
run: |
export NODE_OPTIONS="--max_old_space_size=4096"
yarn install
- name: Update version.md
run: |
touch packages/website/static/version.md
git log -1 &>> packages/website/static/version.md
- name: Build
run: |
yarn ci:deploy:nightly
- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4.3.3
with:
branch: gh-pages # The branch the action should deploy to.
folder: packages/website/build # The folder the action should deploy.
target-folder: ${{ github.event.inputs.targetFolder }}
clean: true
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: Deploy Website [manual]
name: Deploy Website [on push]

on:
workflow_dispatch:
push:
branches: [ release-2.0 ]

jobs:
deploy:
Expand All @@ -23,7 +24,7 @@ jobs:
run: |
touch packages/website/static/version.md
git log -1 &>> packages/website/static/version.md
- name: Build
run: |
yarn ci:deploy:nightly
Expand All @@ -33,5 +34,5 @@ jobs:
with:
branch: gh-pages # The branch the action should deploy to.
folder: packages/website/build # The folder the action should deploy.
target-folder: nightly
clean: true
target-folder: v2
clean: true
6 changes: 5 additions & 1 deletion .github/workflows/deploy-website-on-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,8 @@ jobs:
branch: gh-pages # The branch the action should deploy to.
folder: packages/website/build # The folder the action should deploy.
clean: true
clean-exclude: nightly
clean-exclude: |
nightly
storybook
playground
v1
76 changes: 38 additions & 38 deletions .github/workflows/release-rc-auto.yaml
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
name: Release RC version [auto]
# name: Release RC version [auto]

on:
schedule:
- cron: "00 08 * * THU"
# on:
# schedule:
# - cron: "00 08 * * THU"

jobs:
build-and-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
token: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }}
fetch-depth: 0
- uses: actions/setup-node@v4.0.1
with:
node-version: 18
cache: 'yarn'
# jobs:
# build-and-release:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# with:
# token: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }}
# fetch-depth: 0
# - uses: actions/setup-node@v4.0.1
# with:
# node-version: 18
# cache: 'yarn'

- name: Install
run: yarn --frozen-lockfile
# - name: Install
# run: yarn --frozen-lockfile

- name: Version Bump
env:
NPM_USERNAME: ${{ secrets.NPM_USER }}
NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
NPM_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_AUTH_TOKEN }}
GH_TOKEN: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }}
run: |
npm config set //registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}
git config user.name "${{ secrets.UI5_WEBCOMP_BOT_NAME }}"
git config user.email "${{ secrets.UI5_WEBCOMP_BOT_EMAIL }}"
yarn lerna version --conventional-prerelease --force-publish --yes --exact --create-release github
# - name: Version Bump
# env:
# NPM_USERNAME: ${{ secrets.NPM_USER }}
# NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
# NPM_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_AUTH_TOKEN }}
# GH_TOKEN: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }}
# run: |
# npm config set //registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}
# git config user.name "${{ secrets.UI5_WEBCOMP_BOT_NAME }}"
# git config user.email "${{ secrets.UI5_WEBCOMP_BOT_EMAIL }}"
# yarn lerna version --conventional-prerelease --force-publish --yes --exact --create-release github

- name: Build
run: yarn ci:releasebuild
# - name: Build
# run: yarn ci:releasebuild

- name: Publish
env:
NPM_USERNAME: ${{ secrets.NPM_USER }}
NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
NPM_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_AUTH_TOKEN }}
GH_TOKEN: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }}
run: yarn lerna publish from-git --yes
# - name: Publish
# env:
# NPM_USERNAME: ${{ secrets.NPM_USER }}
# NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
# NPM_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_AUTH_TOKEN }}
# GH_TOKEN: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }}
# run: yarn lerna publish from-git --yes
24 changes: 1 addition & 23 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,18 @@
.gitignore
!packages/create-package/template/.gitignore
!packages/website/.gitignore
tmp
temp
target
dist
jsdoc-dist
**/src/generated
.dev-server-port
# TODO remove this as the tools no longer generate it, kept for clean up (in the clean task as well)
.port

# jsdoc temporary folders
packages/base/jsdoc-dist
packages/main/jsdoc-dist
packages/fiori/jsdoc-dist

# scoping feature generated entry points for vite consumption
packages/compat/test/pages/scoped
packages/main/test/pages/scoped
packages/fiori/test/pages/scoped
packages/main/test/pages/resources/css
packages/fiori/test/pages/resources/css

# Ignore default target directory for the npm package 'ui5-codecompletion'
.ui5

# Ignore npm files/folders
node_modules
npm-debug.log
package-lock.json

# Ignore Mac files
.DS_Store
Expand All @@ -50,14 +34,8 @@ yarn-error.log*
yarn-debug.log*
.yarn-integrity

# Ignore default target directory for the npm package 'ui5-schemas'
.tmp

# Ignore rollup CJS output file of icon-collection-bundler
icon-collection-bundler.cjs.js

# Playground
.jekyll-cache
packages/playground/_site/
packages/playground/.sass-cache/
packages/playground/assets/js/ui5-webcomponents/
Expand Down
Loading

0 comments on commit ab2e01c

Please sign in to comment.