Skip to content

Commit

Permalink
Merge branch 'master' into feature/private-386-creator-new-icons
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitry-kurmanov committed Oct 23, 2024
2 parents 294eac5 + 3f491d0 commit 38a290a
Show file tree
Hide file tree
Showing 108 changed files with 9,159 additions and 269 deletions.
31 changes: 0 additions & 31 deletions .github/issue_template.md

This file was deleted.

14 changes: 14 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: CI
on:
pull_request:
branches: [master]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install modules
run: npm install
- name: Run ESLint
run: npm run lint
46 changes: 39 additions & 7 deletions build-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

- task: NodeTool@0
inputs:
versionSpec: '14.x'
versionSpec: '16.x'
displayName: 'Install Node.js'

- task: CopyFiles@2
Expand Down Expand Up @@ -77,11 +77,17 @@ jobs:
- task: Npm@1
displayName: 'NPM install survey-creator v1'
inputs:
command: install
command: custom
customCommand: install --legacy-peer-deps
verbose: false
workingDir: $(Build.SourcesDirectory)/survey-creator/packages/survey-creator
condition: ne(variables.NPM_CACHE_RESTORED, 'true')

- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator
npx puppeteer browsers install chrome
displayName: "install chrome"
- task: CopyFiles@2
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/SurveyJSLibraryBuildKnockout/packages/survey-knockout'
Expand Down Expand Up @@ -162,7 +168,7 @@ jobs:

- task: NodeTool@0
inputs:
versionSpec: '14.x'
versionSpec: '16.x'
displayName: 'Install Node.js'

- task: CopyFiles@2
Expand Down Expand Up @@ -256,6 +262,7 @@ jobs:

- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-core
npm run build:themes
npm run build:i18n
npm run build
displayName: 'Build Creator V2 Core'
Expand Down Expand Up @@ -364,7 +371,7 @@ jobs:

- task: NodeTool@0
inputs:
versionSpec: '14.x'
versionSpec: '16.x'
displayName: 'Install Node.js'

- task: CopyFiles@2
Expand Down Expand Up @@ -464,6 +471,11 @@ jobs:
workingDir: $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-react
condition: ne(variables.NPM_CACHE_RESTORED, 'true')

- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-react
npx puppeteer browsers install chrome
displayName: "install chrome"
# update 'file' npm dependencies in case of cache
- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-react/node_modules
Expand Down Expand Up @@ -588,7 +600,7 @@ jobs:

- task: NodeTool@0
inputs:
versionSpec: '14.x'
versionSpec: '16.x'
displayName: 'Install Node.js'

- task: CopyFiles@2
Expand Down Expand Up @@ -689,6 +701,11 @@ jobs:
workingDir: $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-knockout
condition: ne(variables.NPM_CACHE_RESTORED, 'true')

- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-knockout
npx puppeteer browsers install chrome
displayName: "install chrome"
# update 'file' npm dependencies in case of cache
- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-knockout/node_modules
Expand Down Expand Up @@ -814,7 +831,7 @@ jobs:

- task: NodeTool@0
inputs:
versionSpec: '14.x'
versionSpec: '16.x'
displayName: 'Install Node.js'

- powershell: |
Expand Down Expand Up @@ -877,6 +894,11 @@ jobs:
rm node_modules/survey-angular-ui
displayName: 'npm install'
- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-angular
npx puppeteer browsers install chrome
displayName: "install chrome"
- task: CopyFiles@2
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/SurveyJSLibraryBuildAngular/packages/survey-angular-ui'
Expand Down Expand Up @@ -1015,6 +1037,11 @@ jobs:
rm node_modules/survey-vue3-ui
displayName: 'npm install'
- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-vue
npx puppeteer browsers install chrome
displayName: "install chrome"
- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-vue
npm run remove-package-lock
Expand Down Expand Up @@ -1089,7 +1116,7 @@ jobs:

- task: NodeTool@0
inputs:
versionSpec: '14.x'
versionSpec: '16.x'
displayName: 'Install Node.js'

- task: CopyFiles@2
Expand Down Expand Up @@ -1189,6 +1216,11 @@ jobs:
workingDir: $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-js
condition: ne(variables.NPM_CACHE_RESTORED, 'true')

- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-js
npx puppeteer browsers install chrome
displayName: "install chrome"
# update 'file' npm dependencies in case of cache
- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-js/node_modules
Expand Down
47 changes: 40 additions & 7 deletions devops-pull-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

- task: NodeTool@0
inputs:
versionSpec: '14.x'
versionSpec: '16.x'
displayName: 'Install Node.js'

- task: CopyFiles@2
Expand Down Expand Up @@ -66,11 +66,17 @@ jobs:
- task: Npm@1
displayName: 'NPM install survey-creator v1'
inputs:
command: install
command: custom
customCommand: install --legacy-peer-deps
verbose: false
workingDir: $(Build.SourcesDirectory)/survey-creator/packages/survey-creator
condition: ne(variables.NPM_CACHE_RESTORED, 'true')

- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator
npx puppeteer browsers install chrome
displayName: "install chrome"
- task: CopyFiles@2
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/SurveyJSLibraryBuildKnockout/packages/survey-knockout'
Expand Down Expand Up @@ -124,7 +130,7 @@ jobs:

- task: NodeTool@0
inputs:
versionSpec: '14.x'
versionSpec: '16.x'
displayName: 'Install Node.js'

- task: CopyFiles@2
Expand Down Expand Up @@ -191,6 +197,7 @@ jobs:
- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-core
npm run build:themes
npm run build:i18n
npm run build
displayName: 'Build Creator V2 Core'
Expand Down Expand Up @@ -227,7 +234,7 @@ jobs:

- task: NodeTool@0
inputs:
versionSpec: '14.x'
versionSpec: '16.x'
displayName: 'Install Node.js'

- task: CopyFiles@2
Expand Down Expand Up @@ -305,6 +312,11 @@ jobs:
workingDir: $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-react
condition: ne(variables.NPM_CACHE_RESTORED, 'true')

- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-react
npx puppeteer browsers install chrome
displayName: "install chrome"
# update 'file' npm dependencies in case of cache
- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-react/node_modules
Expand Down Expand Up @@ -411,7 +423,7 @@ jobs:

- task: NodeTool@0
inputs:
versionSpec: '14.x'
versionSpec: '16.x'
displayName: 'Install Node.js'

- task: CopyFiles@2
Expand Down Expand Up @@ -490,6 +502,11 @@ jobs:
workingDir: $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-knockout
condition: ne(variables.NPM_CACHE_RESTORED, 'true')

- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-knockout
npx puppeteer browsers install chrome
displayName: "install chrome"
# update 'file' npm dependencies in case of cache
- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-knockout/node_modules
Expand Down Expand Up @@ -597,7 +614,7 @@ jobs:

- task: NodeTool@0
inputs:
versionSpec: '14.x'
versionSpec: '16.x'
displayName: 'Install Node.js'

- task: DownloadBuildArtifacts@0
Expand Down Expand Up @@ -655,6 +672,11 @@ jobs:
rm node_modules/survey-angular-ui
displayName: 'npm install'
- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-angular
npx puppeteer browsers install chrome
displayName: "install chrome"
- task: CopyFiles@2
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/SurveyJSLibraryBuildAngular/packages/survey-angular-ui'
Expand Down Expand Up @@ -755,6 +777,11 @@ jobs:
rm node_modules/survey-vue3-ui
displayName: 'npm install'
- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-vue
npx puppeteer browsers install chrome
displayName: "install chrome"
- task: CopyFiles@2
inputs:
SourceFolder: '$(System.ArtifactsDirectory)/SurveyJSLibraryBuildVue3/packages/survey-vue3-ui'
Expand Down Expand Up @@ -793,7 +820,7 @@ jobs:

- task: NodeTool@0
inputs:
versionSpec: '14.x'
versionSpec: '16.x'
displayName: 'Install Node.js'

- task: CopyFiles@2
Expand Down Expand Up @@ -871,6 +898,12 @@ jobs:
workingDir: $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-js
condition: ne(variables.NPM_CACHE_RESTORED, 'true')


- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-js
npx puppeteer browsers install chrome
displayName: "install chrome"
# update 'file' npm dependencies in case of cache
- script: |
cd $(Build.SourcesDirectory)/survey-creator/packages/survey-creator-js/node_modules
Expand Down
Loading

0 comments on commit 38a290a

Please sign in to comment.