Skip to content

Commit

Permalink
Merge pull request #26 from ZEISS/update-dependencies-and-pipeline
Browse files Browse the repository at this point in the history
CFWEB-169 - Update Reuse compliance & dependencies
  • Loading branch information
MariusAquarius authored Aug 5, 2024
2 parents d485dde + 3662fbc commit 4fbcaed
Show file tree
Hide file tree
Showing 6 changed files with 3,840 additions and 5,892 deletions.
2 changes: 1 addition & 1 deletion .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Upstream-Contact: Carl Zeiss AG
Source: https://github.com/ZEISS/angular-styleguide

# files by zeiss
Files: src/app/* src/assets/*.json src/environments/* src/model/* src/support/* src/*.ts src/*.scss src/*.html *.json *.md *.config *.js .gitignore .editorconfig .husky/* .npmrc .prettierignore .github/*
Files: src/app/* src/assets/*.json src/environments/* src/model/* src/support/* src/*.ts src/*.scss src/*.html *.json *.md *.config *.js .gitignore .editorconfig .husky/* .npmrc .prettierignore .github/* browserstack.yml documentation/*
Copyright: 2022 Carl Zeiss AG
License: MIT

Expand Down
2 changes: 1 addition & 1 deletion e2e-wdio/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es2020",
"types": ["node", "@wdio/globals/types", "@wdio/jasmine-framework"]
"types": ["node", "@wdio/globals/types", "@wdio/jasmine-framework", "jasmine"]
}
}
2 changes: 0 additions & 2 deletions e2e-wdio/wdio.conf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ export const config: WebdriverIO.Config = {
// 5 instances get started at a time.
maxInstances: 5,
browserName: 'chrome',
//todo: remove with next dependency-update iteration
browserVersion: '122.0.6261.39',
acceptInsecureCerts: true,
'goog:chromeOptions': {
args: [
Expand Down
Loading

0 comments on commit 4fbcaed

Please sign in to comment.