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

Master to rc (before LF 16.5) #2409

Merged
merged 21 commits into from
Nov 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3cf38ef
LF 16.4 (#2336)
jeremie-lucca Oct 16, 2023
fd5c725
Revert "LF 16.4 (#2336)"
Supamiu Oct 17, 2023
49c7bd0
Merge pull request #2345 from LuccaSA/revert-2336-rc
Supamiu Oct 17, 2023
36b6b16
Merge pull request #2346 from LuccaSA/rc
jeremie-lucca Oct 17, 2023
7fe8792
16.4.stories (#2362)
jeremie-lucca Oct 20, 2023
f3aa4ba
Skeleton in loaders folder (#2363)
jeremie-lucca Oct 20, 2023
5d9faaf
skeletons docs fixes (#2365)
jeremie-lucca Oct 20, 2023
62a913c
Display S & XS together (#2366)
jeremie-lucca Oct 20, 2023
186bae8
arrow as form child (#2368)
jeremie-lucca Oct 20, 2023
c7b28a7
fix(select): invalid initial v4 sort
GuillaumeNury Oct 23, 2023
931e8ab
fix(icons): fix missing type export in built bundle
Supamiu Oct 24, 2023
ddacab0
Merge pull request #2374 from LuccaSA/hotfix/lucca-icons-type
Supamiu Oct 24, 2023
4a8c040
chore(ci): use linux node (#2373)
shajz Oct 24, 2023
a6065f1
Merge pull request #2371 from LuccaSA/fix.v4.sorting
GuillaumeNury Oct 25, 2023
af91a9e
docs(core): Component docs improvements (#2377)
Supamiu Oct 25, 2023
089c7c6
fix date-select search
LucasPerrault Oct 25, 2023
9db4f3a
[pr-review][corentin] clean code
LucasPerrault Oct 26, 2023
09d9115
fix(select): mark select as touched when closing panel
GuillaumeNury Oct 27, 2023
df573d9
Merge pull request #2384 from LuccaSA/fix.select.touched
GuillaumeNury Oct 27, 2023
692df75
test new story format with HTML component (#2375)
jeremie-lucca Oct 31, 2023
b66082d
Merge pull request #2381 from LuccaSA/fix.date.select.search
jeremie-lucca Oct 31, 2023
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
108 changes: 46 additions & 62 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
@Library('Lucca@v0.62.0') _
@Library('Lucca@v0.63.6') _

import hudson.Util
import fr.lucca.CI

ciBuildProperties script:this

node(label: CI.getSelectedNode(script:this)) {
notifyStartStats()

node(label: CI.getSelectedLinuxNode(script:this)) {
def projectTechnicalName = 'lucca-front'
def repoName = "lucca-front"

Expand All @@ -24,80 +22,66 @@ node(label: CI.getSelectedNode(script:this)) {

try {
timeout(time: 10, unit: 'MINUTES') {
loggableStage('Cleanup') {
// storybook static
if (fileExists('storybook')) {
dir('storybook') {
deleteDir()
}
}
}

loggableStage('Checkout') {
scmVars = checkout scm
}

loggableStage('Restore') {
npmCi()
}

if (!isPR) {
loggableStage('Qualif') {
// it must be buildable
bat "npm run build"
// it must break no test
bat "npm run jenkins-test"
// it must be lint compliant
bat "npm run lint"
npmCi()

npmScript(script: 'build')
npmScript(script: 'jenkins-test', skip: isPR)
npmScript(script: 'lint', skip: isPR)

def shouldDeploy = isPR || isRc || isMaster;

loggableStage('Deploy', !shouldDeploy) {
echo "deploying ${branchName}"
npmScript(script: 'build-storybook')
npmScript(script: 'build-compodoc')

// FIXME Deploy with windows node for now
stash(name: "storybook-static", includes: "storybook-static/**")
stash(name: "compodoc-static", includes: "compodoc-static/**")
node("windows") {
unstash(name: "storybook-static")
powershell "Remove-Item \\\\RBX1-SH1-TECH\\lucca-front\\${env.BRANCH_NAME}\\storybook -Recurse"
powershell "Copy-Item storybook-static \\\\RBX1-SH1-TECH\\lucca-front\\${env.BRANCH_NAME}\\storybook -Recurse"
unstash(name: "compodoc-static")
powershell "Remove-Item \\\\RBX1-SH1-TECH\\lucca-front\\${env.BRANCH_NAME}\\compodoc -Recurse"
powershell "Copy-Item compodoc-static \\\\RBX1-SH1-TECH\\lucca-front\\${env.BRANCH_NAME}\\compodoc -Recurse"
}
}

if (isPR || isRc || isMaster) {
loggableStage('Deploy') {
echo "deploying ${branchName}"
bat "npm run build-storybook"
bat "npm run build-compodoc"
powershell "Remove-Item \\\\RBX1-SH1-TECH\\lucca-front\\${branchName}\\storybook -Recurse"
powershell "Remove-Item \\\\RBX1-SH1-TECH\\lucca-front\\${branchName}\\compodoc -Recurse"
powershell "Copy-Item storybook-static \\\\RBX1-SH1-TECH\\lucca-front\\${branchName}\\storybook -Recurse"
powershell "Copy-Item compodoc-static \\\\RBX1-SH1-TECH\\lucca-front\\${branchName}\\compodoc -Recurse"
}

loggableStage('e2e') {
publishE2e(loggableStageName: 'e2e', slnFilepath: 'e2e\\LuccaFront.e2e.sln', framework: "net6.0")
archiveElements(e2e: true)
}

commentOnPR(
credentialsId: 'ux-comment-token',
body: ":woman_cook: https://lucca-front.lucca.tech/${branchName}/storybook",
repoName: projectTechnicalName,
skip: !isPR
)
loggableStage('e2e', !shouldDeploy) {
publishE2e(loggableStageName: 'e2e', slnFilepath: 'e2e/LuccaFront.e2e.sln', framework: "net6.0")
archiveElements(e2e: true)
}

if (!isPR) {
loggableStage('Publish') {
def version = env.BRANCH_NAME
commentOnPR(
credentialsId: 'ux-comment-token',
body: ":woman_cook: https://lucca-front.lucca.tech/${branchName}/storybook",
repoName: projectTechnicalName,
skip: !isPR
)

def iconsPackageJson = readFile(file: 'dist/icons/package.json');
def scssPackageJson = readFile(file: 'dist/scss/package.json');
def ngPackageJson = readFile(file: 'dist/ng/package.json');
loggableStage('Publish', isPR) {
def version = env.BRANCH_NAME

writeFile(file: 'dist/icons/package.json', text: iconsPackageJson.replaceAll('"\\*"', "\"${version}\""));
writeFile(file: 'dist/scss/package.json', text: scssPackageJson.replaceAll('"\\*"', "\"${version}\""));
writeFile(file: 'dist/ng/package.json', text: ngPackageJson.replaceAll('"\\*"', "\"${version}\""));
def iconsPackageJson = readFile(file: 'dist/icons/package.json');
def scssPackageJson = readFile(file: 'dist/scss/package.json');
def ngPackageJson = readFile(file: 'dist/ng/package.json');

publishNpmOnReleaseTag(publishFolder: 'dist/icons')
publishNpmOnReleaseTag(publishFolder: 'dist/scss')
publishNpmOnReleaseTag(publishFolder: 'dist/ng')
}
writeFile(file: 'dist/icons/package.json', text: iconsPackageJson.replaceAll('"\\*"', "\"${version}\""));
writeFile(file: 'dist/scss/package.json', text: scssPackageJson.replaceAll('"\\*"', "\"${version}\""));
writeFile(file: 'dist/ng/package.json', text: ngPackageJson.replaceAll('"\\*"', "\"${version}\""));

publishNpmOnReleaseTag(publishFolder: 'dist/icons')
publishNpmOnReleaseTag(publishFolder: 'dist/scss')
publishNpmOnReleaseTag(publishFolder: 'dist/ng')
}
}
} catch(err) {
println err
currentBuild.result = 'failure'
}

notifyEndStats()
}
2 changes: 1 addition & 1 deletion build.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ runTask('Lucca Front compilation', async () => {
output: OUTPUT_ICONS,
});
copyFiles({
patterns: ['lucca-icon.d.ts', 'package.json', 'src/**'],
patterns: ['index.d.ts', 'package.json', 'src/**'],
context: ICONS,
output: OUTPUT_ICONS,
});
Expand Down
Loading