Skip to content

Commit c48c777

Browse files
authored
Merge branch 'development' into iframe_svg
2 parents 17867ad + 8468f80 commit c48c777

27 files changed

+22873
-12848
lines changed

.babelrc

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
"@babel/plugin-transform-runtime"
88
],
99
"env": {
10-
"development": {
11-
"plugins": [
12-
"react-refresh/babel"
13-
]
14-
}
10+
"development": {}
1511
}
16-
}
12+
}

.env.dev

Lines changed: 0 additions & 26 deletions
This file was deleted.

.env.prod

Lines changed: 0 additions & 26 deletions
This file was deleted.

.env.local renamed to .env.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ LOGIN_PROVIDER_URI=https://hslid-uat.cinfra.fi
2626
GROUP_GENERATE=
2727
GROUP_READONLY=
2828

29-
BUILD_ENV=local
29+
BUILD_ENV=local

.github/workflows/buildAndPublish_dev.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/workflows/buildAndPublish_prod.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/workflows/buildAndPublish_stage.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/workflows/buildOnPullRequest.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/ci-cd.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: "CI/CD: Continuous integration and continuous deployment"
3+
4+
"on":
5+
push:
6+
branches:
7+
- master
8+
- development
9+
tags:
10+
- "v*"
11+
pull_request:
12+
merge_group:
13+
14+
jobs:
15+
build-check-test-push:
16+
uses: HSLdevcom/transitdata-shared-workflows/.github/workflows/ci-cd-typescript.yml@publisher-wip
17+
secrets:
18+
DOCKER_USERNAME: ${{ secrets.KARTAT_DOCKERHUB_USER }}
19+
DOCKER_PASSWORD: ${{ secrets.KARTAT_DOCKERHUB_TOKEN }}
20+
with:
21+
checkAndTestOutsideDocker: true
22+
codeCoverageEnabled: true
23+
performRelease: false
24+
checkAndTestInsideDocker: false

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@ yarn-error.log
88
/templates
99
graphql.config.json
1010
output/*
11-
<<<<<<< Updated upstream
1211
.env
13-
=======
1412
.env*
1513
!.env.template
16-
>>>>>>> Stashed changes
1714
secrets
1815
/test/results/*

0 commit comments

Comments
 (0)