Skip to content
This repository was archived by the owner on Apr 16, 2024. It is now read-only.

Commit 95118e1

Browse files
authored
Merge branch 'develop' into feature/42-import-export
2 parents 5ce7869 + 12cd1eb commit 95118e1

File tree

78 files changed

+1171
-777
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+1171
-777
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ nohup.out
6666
docker-compose.override.yml
6767

6868
# Web Frontend
69-
# nothing so far
69+
app/webFrontend/dist
7070

7171
# Never ignore .gitkeep files
7272
# Note that the ignore has to look like: /some/path/* and not eg. /some/path

.travis.yml

+3
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,15 @@ script:
7272
- cd ..
7373
# run backend-tests and return back to root for following steps
7474
- cd api
75+
- sed -i 's/$TRAVIS_COMMIT/'$TRAVIS_COMMIT'/' src/server.ts
7576
- npm run test # run backend test
7677
- cd ..
7778
# run frontend-tests and return back to root for following steps
7879
- cd app/webFrontend
7980
- npm run lint # run linter
8081
# - npm run test # run test - does not work properly
8182
- npm run e2e # run end-to-end-tests
83+
- sed -i 's/$TRAVIS_COMMIT/'$TRAVIS_COMMIT'/' src/app/shared/services/raven-error-handler.service.ts
8284
- npm run build # build in prod mode
8385
- cd ../..
8486

@@ -90,6 +92,7 @@ after_success:
9092
- .travis/package-checker.sh
9193
- .travis/docker.sh
9294
- .travis/deploy.sh
95+
- .travis/sentry.sh
9396

9497
# Configure notifications
9598
notifications:

.travis/sentry.sh

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env bash
2+
3+
if [[ "$TRAVIS_PULL_REQUEST" == "false" && ("$TRAVIS_BRANCH" == "master" || "$TRAVIS_BRANCH" == "develop") ]]; then
4+
echo "Downloading and installing sentry-cli"
5+
export INSTALL_DIR=$(pwd)
6+
curl -sL https://sentry.io/get-cli/ | bash
7+
8+
echo "Creating Sentry release and uploading source maps"
9+
./sentry-cli releases -o geli -p staging new $TRAVIS_COMMIT
10+
./sentry-cli releases -o geli -p staging files $TRAVIS_COMMIT upload-sourcemaps app/webFrontend/dist
11+
./sentry-cli releases -o geli -p staging files $TRAVIS_COMMIT upload-sourcemaps --url-prefix /usr/src/app api/build
12+
fi

api/gulpfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ gulp.task(COMPILE_TYPESCRIPT, function () {
8181
return gulp.src(TS_GLOB, {base: "."})
8282
.pipe(sourcemaps.init())
8383
.pipe(tsProject())
84-
.pipe(sourcemaps.write())
84+
.pipe(sourcemaps.write('maps'))
8585
.pipe(gulp.dest("./build"));
8686
});
8787

0 commit comments

Comments
 (0)