Skip to content

Commit

Permalink
Merge branch 'feat/angular-ionic-update' into 'develop'
Browse files Browse the repository at this point in the history
Feat/angular ionic update

See merge request papers/airgap/airgap-wallet!746
  • Loading branch information
Stephen Debel committed May 13, 2024
2 parents fd48ffa + a810c21 commit 883b831
Show file tree
Hide file tree
Showing 7 changed files with 7,896 additions and 4,706 deletions.
7 changes: 3 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include:
- project: "papers/papers-internal/internal"
file: "/.base-gitlab-ci.yml"
- project: 'papers/papers-internal/internal'
file: '/.base-gitlab-ci.yml'

variables:
TEST_TAG: test_$CI_COMMIT_SHA
Expand Down Expand Up @@ -88,7 +88,7 @@ build-ios:
- echo "$IOS_BUILD_JSON" > build.json
script:
- export DEVELOPER_DIR=$XCODE_PATH
- nvm use 16
- nvm use 20
- npm install --legacy-peer-deps
- npm run prepare-prod-build
- npm run apply-diagnostic-modules # manually remove unused cordova-diagnostic-plugin modules
Expand Down Expand Up @@ -185,7 +185,6 @@ publish-web-dev:
needs:
- build-web


publish-web-prod:
stage: publish
extends: .publish-prod
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16.19.1
FROM node:20

# See https://crbug.com/795759
RUN apt-get update && apt-get install -yq libgconf-2-4 bzip2 build-essential libxtst6
Expand Down
6 changes: 3 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,19 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "app:build"
"buildTarget": "app:build"
},
"configurations": {
"production": {
"browserTarget": "app:build:production"
"buildTarget": "app:build:production"
},
"ci": {}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "app:build"
"buildTarget": "app:build"
}
},
"test": {
Expand Down
Loading

0 comments on commit 883b831

Please sign in to comment.