Skip to content

Commit

Permalink
upgrade node to 16
Browse files Browse the repository at this point in the history
added overrides

try adding user

removed userinfo

upgrade ionic cli

try adding user with bash

removed password

capactiroe core overrides

updated cli

testing with variable name

env to vars

changes
  • Loading branch information
amish1188 committed May 4, 2023
1 parent f84c391 commit 31d45fd
Show file tree
Hide file tree
Showing 5 changed files with 26,470 additions and 649 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:
build_and_deploy_pull_request:
if: github.event_name == 'pull_request' && github.event.action != 'closed'
runs-on: ubuntu-latest
env:
SHELL: ${{ vars.SHELL}}
name: Build and Deploy Pull Request
steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This is the Varsom RegObs app version 4. It is based on code from version 3 but

## Installation

1. Installer node v14 [Installer node v14.x.x](https://nodejs.org/download/release/latest-v14.x/) (.msi-fil for
1. Installer node v16 [Installer node v16.x.x](https://nodejs.org/download/release/latest-v16.x/) (.msi-fil for
Windows) **
Ikke nyere eller
eldre versjon**
Expand Down Expand Up @@ -308,7 +308,7 @@ Overwrite /assets/json/regions-simple-polygons.json
For hver commit til develop-branchen skal Lokalise automatisk hente endringer fra github. Hvis ikke dette fungerer kan en "pull" til
Lokalise fra Github trigges manuelt fra Lokalise.

For å bruke script som går mot Lokalise trengs en api-key som kan opprettes under din bruker i Lokalise. Legg den i `translations\lokalise-api-key.json` med innhold
For å bruke script som går mot Lokalise trengs en api-key som kan opprettes under din bruker i Lokalise. Legg den i `translations\lokalise-api-key.json` med innhold

```
{"apiKey": "..."}
Expand Down
95 changes: 47 additions & 48 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,64 +2,63 @@
# https://aka.ms/yaml

trigger:
- develop
- develop

pool:
vmImage: 'ubuntu-latest'

variables:
- group: sentryProperties
- name: npm_config_cache
value: $(Pipeline.Workspace)/.npm

- group: sentryProperties
- name: npm_config_cache
value: $(Pipeline.Workspace)/.npm

steps:
- task: NodeTool@0
displayName: 'Use Node 14.x'
inputs:
versionSpec: 14.x
checkLatest: true
- task: NodeTool@0
displayName: 'Use Node 16.x'
inputs:
versionSpec: 16.x
checkLatest: true

- task: Cache@2
inputs:
key: 'npm | "$(Agent.OS)" | package-lock.json'
restoreKeys: |
npm | "$(Agent.OS)"
path: $(npm_config_cache)
displayName: Cache npm
- task: Cache@2
inputs:
key: 'npm | "$(Agent.OS)" | package-lock.json'
restoreKeys: |
npm | "$(Agent.OS)"
path: $(npm_config_cache)
displayName: Cache npm

- script: npm ci
- script: npm ci

- task: DownloadSecureFile@1
displayName: 'Download secure file'
inputs:
secureFile: '8a4eb7ac-653f-40c8-a421-d0a145352828'
retryCount: 5
- task: DownloadSecureFile@1
displayName: 'Download secure file'
inputs:
secureFile: '8a4eb7ac-653f-40c8-a421-d0a145352828'
retryCount: 5

- task: CopyFiles@2
displayName: 'Copy Files to: ./src/assets'
inputs:
SourceFolder: '$(Agent.TempDirectory)'
Contents: apikey.json
TargetFolder: ./src/assets
- task: Npm@1
displayName: 'npm run tests'
inputs:
command: custom
verbose: false
customCommand: 'run test-ci'
- task: CopyFiles@2
displayName: 'Copy Files to: ./src/assets'
inputs:
SourceFolder: '$(Agent.TempDirectory)'
Contents: apikey.json
TargetFolder: ./src/assets
- task: Npm@1
displayName: 'npm run tests'
inputs:
command: custom
verbose: false
customCommand: 'run test-ci'

- task: PublishTestResults@2
displayName: 'Publish Test Results **/TESTS-*.xml'
condition: succeededOrFailed()
inputs:
testResultsFiles: '**/TESTS-*.xml'
- task: PublishTestResults@2
displayName: 'Publish Test Results **/TESTS-*.xml'
condition: succeededOrFailed()
inputs:
testResultsFiles: '**/TESTS-*.xml'

- task: PublishCodeCoverageResults@1
displayName: 'Publish code coverage from **/cobertura-coverage.xml'
condition: succeededOrFailed()
inputs:
codeCoverageTool: Cobertura
summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml'
reportDirectory: '$(System.DefaultWorkingDirectory)/coverage'
failIfCoverageEmpty: true
- task: PublishCodeCoverageResults@1
displayName: 'Publish code coverage from **/cobertura-coverage.xml'
condition: succeededOrFailed()
inputs:
codeCoverageTool: Cobertura
summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml'
reportDirectory: '$(System.DefaultWorkingDirectory)/coverage'
failIfCoverageEmpty: true
Loading

0 comments on commit 31d45fd

Please sign in to comment.