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

lts 2025 #963

Merged
merged 2 commits into from
Oct 28, 2024
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/cleanup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
types: [closed, unlabeled]
branches:
- maintenance-3.1.x
- lts-2025

env:
GKE_CLUSTER: jx-prod
Expand Down Expand Up @@ -52,6 +52,6 @@ jobs:
repo: nuxeo-web-ui
workflow-id: clean.yaml
access-token: ${{ secrets.WEBUI_ACCESS_TOKEN_PERSONAL }}
branch-name: maintenance-3.1.x
branch-name: lts-2025
inputs: |
branch_name: ${{ env.BRANCH_NAME }}
8 changes: 4 additions & 4 deletions .github/workflows/cross-repo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Web UI
on:
pull_request:
branches:
- maintenance-3.1.x
- lts-2025
workflow_call:
inputs:
branch:
description: 'The current branch'
default: maintenance-3.1.x
default: lts-2025
type: string
required: false
secrets:
Expand All @@ -17,7 +17,7 @@ on:
required: true

env:
BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.1.x' }}
BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'lts-2025' }}

jobs:
web-ui:
Expand All @@ -32,7 +32,7 @@ jobs:
repo: nuxeo-web-ui
workflow-id: cross-repo.yaml
access-token: ${{ secrets.WEBUI_ACCESS_TOKEN_PERSONAL }}
branch-name: maintenance-3.1.x
branch-name: lts-2025
inputs: |
branch_name: ${{ env.BRANCH_NAME }}
sauce_labs: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/crowdin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ on:
schedule:
- cron: '0 0 * * *'

# Sync when a commit is done on maintenance-3.1.x
# Sync when a commit is done on lts-2025
push:
branches:
- maintenance-3.1.x
- lts-2025
paths:
- 'ui/i18n/messages.json'

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Lint
on:
pull_request:
branches:
- maintenance-3.1.x
- lts-2025
workflow_call:
inputs:
branch:
description: 'The current branch'
default: maintenance-3.1.x
default: lts-2025
type: string
required: false
secrets:
Expand All @@ -17,7 +17,7 @@ on:
required: true

env:
BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.1.x' }}
BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'lts-2025' }}

jobs:
lint:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build
on:
push:
branches:
- maintenance-3.1.x
- lts-2025

# Manually trigger the workflow
workflow_dispatch:
Expand All @@ -14,24 +14,24 @@ env:

jobs:
lint:
uses: nuxeo/nuxeo-elements/.github/workflows/lint.yaml@maintenance-3.1.x
uses: nuxeo/nuxeo-elements/.github/workflows/lint.yaml@lts-2025
secrets:
NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }}

test:
uses: nuxeo/nuxeo-elements/.github/workflows/test.yaml@maintenance-3.1.x
uses: nuxeo/nuxeo-elements/.github/workflows/test.yaml@lts-2025
secrets:
NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }}
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
with:
branch: maintenance-3.1.x
branch: lts-2025

storybook:
uses: nuxeo/nuxeo-elements/.github/workflows/storybook.yaml@maintenance-3.1.x
uses: nuxeo/nuxeo-elements/.github/workflows/storybook.yaml@lts-2025
secrets:
NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }}
with:
branch: maintenance-3.1.x
branch: lts-2025

build:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/preview.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
types: [opened, synchronize, reopened, labeled]
branches:
- maintenance-3.1.x
- lts-2025

env:
DOCKER_REGISTRY: us-east1-docker.pkg.dev
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
repo: nuxeo-web-ui
workflow-id: preview.yaml
access-token: ${{ secrets.WEBUI_ACCESS_TOKEN_PERSONAL }}
branch-name: maintenance-3.1.x
branch-name: lts-2025
inputs: |
branch_name: ${{ env.BRANCH_NAME }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/promote.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
referenceBranch:
description: 'Branch to be updated after the promotion'
required: true
default: 'maintenance-3.1.x'
default: 'lts-2025'
dryRun:
description: 'Run the workflow without pushing code or publishing artifacts'
type: boolean
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/storybook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Storybook
on:
pull_request:
branches:
- maintenance-3.1.x
- lts-2025
workflow_call:
inputs:
branch:
description: 'The current branch'
default: maintenance-3.1.x
default: lts-2025
type: string
required: false
secrets:
Expand All @@ -17,7 +17,7 @@ on:
required: true

env:
BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.1.x' }}
BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'lts-2025' }}

jobs:
storybook:
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
npx build-storybook -o dist -s ./public

- name: Deploy
if: ${{ env.BRANCH_NAME == 'maintenance-3.1.x' }}
if: ${{ env.BRANCH_NAME == 'lts-2025' }}
env:
GH_TOKEN: ${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}
NODE_OPTIONS: --openssl-legacy-provider
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Test
on:
pull_request:
branches:
- maintenance-3.1.x
- lts-2025
workflow_call:
inputs:
branch:
description: 'The current branch'
default: maintenance-3.1.x
default: lts-2025
type: string
required: false
secrets:
Expand All @@ -20,7 +20,7 @@ on:
required: true

env:
BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.1.x' }}
BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'lts-2025' }}

jobs:
test:
Expand Down
4 changes: 2 additions & 2 deletions core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
],
"repository": "nuxeo/nuxeo-elements.git",
"name": "@nuxeo/nuxeo-elements",
"version": "3.1.14-SNAPSHOT",
"version": "3.2.0-SNAPSHOT",
"author": "Nuxeo",
"license": "Apache-2.0",
"scripts": {
Expand All @@ -21,7 +21,7 @@
},
"devDependencies": {
"@nuxeo/moment": "^2.24.0-nx.0",
"@nuxeo/testing-helpers": "^3.1.14-SNAPSHOT",
"@nuxeo/testing-helpers": "^3.2.0-SNAPSHOT",
"@polymer/iron-component-page": "^4.0.0",
"polymer-cli": "^1.8.0"
},
Expand Down
6 changes: 3 additions & 3 deletions dataviz/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
],
"repository": "nuxeo/nuxeo-elements.git",
"name": "@nuxeo/nuxeo-dataviz-elements",
"version": "3.1.14-SNAPSHOT",
"version": "3.2.0-SNAPSHOT",
"author": "Nuxeo",
"license": "Apache-2.0",
"scripts": {
"docs": "polymer analyze . > analysis.json && npm run serve",
"serve": "polymer serve --npm -c ../node_modules"
},
"devDependencies": {
"@nuxeo/testing-helpers": "^3.1.14-SNAPSHOT",
"@nuxeo/testing-helpers": "^3.2.0-SNAPSHOT",
"@polymer/iron-component-page": "^4.0.0",
"@polymer/test-fixture": "^4.0.2",
"@webcomponents/webcomponentsjs": "^2.0.0",
Expand All @@ -32,7 +32,7 @@
"main": "nuxeo-dataviz-elements.js",
"dependencies": {
"@nuxeo/moment": "^2.24.0-nx.0",
"@nuxeo/nuxeo-elements": "^3.1.14-SNAPSHOT",
"@nuxeo/nuxeo-elements": "^3.2.0-SNAPSHOT",
"@polymer/polymer": "^3.0.0",
"moment": "2.30.1"
}
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"packages": [
"*"
],
"version": "3.1.14-SNAPSHOT",
"version": "3.2.0-SNAPSHOT",
"hoist": true
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"repository": "nuxeo/nuxeo-elements.git",
"name": "nuxeo-elements",
"private": true,
"version": "3.1.14-SNAPSHOT",
"version": "3.2.0-SNAPSHOT",
"author": "Nuxeo",
"license": "Apache-2.0",
"engines": {
Expand Down
8 changes: 4 additions & 4 deletions storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"description": "Nuxeo Web Components Storybook",
"repository": "nuxeo/nuxeo-elements.git",
"name": "@nuxeo/nuxeo-elements-storybook",
"version": "3.1.14-SNAPSHOT",
"version": "3.2.0-SNAPSHOT",
"author": "Nuxeo",
"license": "Apache-2.0",
"private": true,
"dependencies": {
"@babel/core": "^7.3.4",
"@nuxeo/nuxeo-elements": "^3.1.14-SNAPSHOT",
"@nuxeo/nuxeo-ui-elements": "^3.1.14-SNAPSHOT",
"@nuxeo/testing-helpers": "^3.1.14-SNAPSHOT",
"@nuxeo/nuxeo-elements": "^3.2.0-SNAPSHOT",
"@nuxeo/nuxeo-ui-elements": "^3.2.0-SNAPSHOT",
"@nuxeo/testing-helpers": "^3.2.0-SNAPSHOT",
"@polymer/iron-icon": "^3.0.0",
"@polymer/iron-meta": "^3.0.1",
"@polymer/polymer": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion testing-helpers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxeo/testing-helpers",
"version": "3.1.14-SNAPSHOT",
"version": "3.2.0-SNAPSHOT",
"description": "Nuxeo Web Components Testing Helpers",
"keywords": [
"nuxeo",
Expand Down
6 changes: 3 additions & 3 deletions ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxeo/nuxeo-ui-elements",
"version": "3.1.14-SNAPSHOT",
"version": "3.2.0-SNAPSHOT",
"description": "Nuxeo UI Web Components.",
"keywords": [
"nuxeo",
Expand All @@ -18,15 +18,15 @@
"serve": "polymer serve --npm -c ../node_modules"
},
"devDependencies": {
"@nuxeo/testing-helpers": "^3.1.14-SNAPSHOT",
"@nuxeo/testing-helpers": "^3.2.0-SNAPSHOT",
"@polymer/iron-component-page": "^4.0.0",
"@webcomponents/webcomponentsjs": "^2.0.0",
"polymer-cli": "^1.8.0"
},
"main": "nuxeo-ui-elements.js",
"dependencies": {
"@nuxeo/moment": "^2.24.0-nx.0",
"@nuxeo/nuxeo-elements": "^3.1.14-SNAPSHOT",
"@nuxeo/nuxeo-elements": "^3.2.0-SNAPSHOT",
"@nuxeo/paper-typeahead": "^0.6.0-nx.0",
"@nuxeo/quill": "^2.0.0-dev.3-nx.3",
"@polymer/iron-autogrow-textarea": "^3.0.1",
Expand Down
Loading