Skip to content

Commit b7028ef

Browse files
JokinenJokinen
authored
Merge pull request #128 from City-of-Helsinki/release/1.5.0
[master] Release 1.5.0
2 parents a35aaf3 + 9a1a225 commit b7028ef

172 files changed

Lines changed: 6264 additions & 1616 deletions

File tree

Some content is hidden

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

‎.env.example‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ REACT_APP_SENTRY_DSN=https://c89ee3f57dc94ffd940d1df1a353b97f@sentry.hel.ninja/5
88

99
BROWSER_TESTS_UID=
1010
BROWSER_TESTS_PWD=
11+
BROWSER_TESTS_ENV_URL=http://localhost:3001

‎.github/workflows/CI.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: [ develop, master ]
6+
pull_request:
7+
8+
jobs:
9+
10+
build:
11+
name: Lint and build
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v2
15+
- name: Use Node.js 12.x
16+
uses: actions/setup-node@v1
17+
with:
18+
node-version: 12.x
19+
- name: Create yarn cache directory path
20+
id: yarn-cache
21+
run: echo "::set-output name=dir::$(yarn cache dir)"
22+
- name: Cache dependencies
23+
uses: actions/cache@v1
24+
with:
25+
path: ${{ steps.yarn-cache.outputs.dir }}
26+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
27+
restore-keys: |
28+
${{ runner.os }}-yarn-
29+
- name: Install dependencies
30+
# Prefer offline to check cache before downloading
31+
run: yarn --prefer-offline
32+
- name: Lint application
33+
run: yarn lint
34+
- name: Build application
35+
run: yarn build
36+
37+
test:
38+
name: Test
39+
runs-on: ubuntu-latest
40+
steps:
41+
- uses: actions/checkout@v2
42+
- name: Use Node.js 12.x
43+
uses: actions/setup-node@v1
44+
with:
45+
node-version: 12.x
46+
- name: Create yarn cache directory path
47+
id: yarn-cache
48+
run: echo "::set-output name=dir::$(yarn cache dir)"
49+
- name: Cache dependencies
50+
uses: actions/cache@v1
51+
with:
52+
path: ${{ steps.yarn-cache.outputs.dir }}
53+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
54+
restore-keys: |
55+
${{ runner.os }}-yarn-
56+
- name: Install dependencies
57+
# Prefer offline to check cache before downloading
58+
run: yarn --prefer-offline
59+
- name: Run tests
60+
run: yarn test --collect-coverage
61+
- name: Upload coverage report to Codecov
62+
uses: codecov/codecov-action@v1

‎.github/workflows/browser-test.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Browser tests
2+
3+
on:
4+
schedule:
5+
# Every weekday (Mon-Fri) at 9 in the morning
6+
- cron: '0 9 * * 1-5'
7+
workflow_dispatch:
8+
9+
jobs:
10+
browser_test:
11+
name: Browser tests
12+
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Use Node.js 12.x
18+
uses: actions/setup-node@v1
19+
with:
20+
node-version: 12.x
21+
- name: Create yarn cache directory path
22+
id: yarn-cache
23+
run: echo "::set-output name=dir::$(yarn cache dir)"
24+
- name: Cache dependencies
25+
uses: actions/cache@v1
26+
with:
27+
path: ${{ steps.yarn-cache.outputs.dir }}
28+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
29+
restore-keys: |
30+
${{ runner.os }}-yarn-
31+
- name: Install dependencies
32+
# Prefer offline to check cache before downloading
33+
run: yarn --prefer-offline
34+
- name: Run browser tests against staging server
35+
run: yarn test:browser:ci
36+
env:
37+
BROWSER_TESTS_ENV_URL: https://kukkuu-admin.test.kuva.hel.ninja
38+
BROWSER_TESTS_UID: ${{ secrets.BROWSER_TESTS_UID }}
39+
BROWSER_TESTS_PWD: ${{ secrets.BROWSER_TESTS_PWD }}

‎.github/workflows/production.yml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Build & Production
2+
on:
3+
push:
4+
tags:
5+
- 'release-*'
6+
branches:
7+
- master
8+
9+
env:
10+
CONTAINER_REGISTRY: ghcr.io
11+
CONTAINER_REGISTRY_USER: ${{ secrets.GHCR_CONTAINER_REGISTRY_USER }}
12+
CONTAINER_REGISTRY_PASSWORD: ${{ secrets.GHCR_TOKEN }}
13+
CONTAINER_REGISTRY_REPO: ghcr.io/city-of-helsinki/${{ github.event.repository.name }}
14+
REPO_NAME: ${{ github.event.repository.name }}
15+
KUBECONFIG_RAW: ${{ secrets.KUBECONFIG_RAW_STABLE }}
16+
BUILD_ARTIFACT_FOLDER: 'build_artifacts'
17+
SERVICE_ARTIFACT_FOLDER: 'service_artifacts'
18+
SERVICE_PORT: 80
19+
20+
jobs:
21+
build:
22+
if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')
23+
runs-on: ubuntu-latest
24+
name: Build
25+
steps:
26+
- uses: actions/checkout@v2
27+
- name: Build
28+
uses: andersinno/kolga-build-action@v2
29+
env:
30+
DOCKER_IMAGE_NAME: ${{ env.REPO_NAME }}-production
31+
DOCKER_BUILD_ARG_REACT_APP_ENVIRONMENT: 'production'
32+
DOCKER_BUILD_ARG_REACT_APP_OIDC_AUTHORITY: 'https://api.hel.fi/sso'
33+
DOCKER_BUILD_ARG_REACT_APP_OIDC_CLIENT_ID: 'https://api.hel.fi/auth/kukkuu-admin-ui'
34+
DOCKER_BUILD_ARG_REACT_APP_OIDC_SCOPE: 'openid profile https://api.hel.fi/auth/kukkuuapiprod'
35+
DOCKER_BUILD_ARG_REACT_APP_KUKKUU_API_OIDC_SCOPE: 'https://api.hel.fi/auth/kukkuuapiprod'
36+
DOCKER_BUILD_ARG_REACT_APP_API_URI: 'https://kukkuu-api.prod.hel.ninja/kukkuu/graphql'
37+
DOCKER_BUILD_ARG_REACT_APP_SENTRY_DSN: 'https://c89ee3f57dc94ffd940d1df1a353b97f@sentry.hel.ninja/55'
38+
39+
production:
40+
if: startsWith(github.ref, 'refs/tags')
41+
runs-on: ubuntu-latest
42+
needs: build
43+
name: Production
44+
steps:
45+
- uses: actions/checkout@v2
46+
- uses: andersinno/kolga-setup-action@v2
47+
48+
- name: Deploy
49+
uses: andersinno/kolga-deploy-action@v2
50+
with:
51+
track: 'stable'
52+
env:
53+
K8S_NAMESPACE: ${{ secrets.K8S_NAMESPACE_STABLE }}
54+
ENVIRONMENT_URL: https://${{ secrets.ENVIRONMENT_URL_STABLE }}
55+
DOCKER_IMAGE_NAME: ${{ env.REPO_NAME }}-production

‎.github/workflows/review.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Build & Review
2+
on: [pull_request]
3+
4+
env:
5+
CONTAINER_REGISTRY: ghcr.io
6+
CONTAINER_REGISTRY_USER: ${{ secrets.GHCR_CONTAINER_REGISTRY_USER }}
7+
CONTAINER_REGISTRY_PASSWORD: ${{ secrets.GHCR_TOKEN }}
8+
CONTAINER_REGISTRY_REPO: ghcr.io/city-of-helsinki/${{ github.event.repository.name }}
9+
REPO_NAME: ${{ github.event.repository.name }}
10+
KUBECONFIG_RAW: ${{ secrets.KUBECONFIG_RAW }}
11+
BUILD_ARTIFACT_FOLDER: 'build_artifacts'
12+
SERVICE_ARTIFACT_FOLDER: 'service_artifacts'
13+
BASE_DOMAIN: ${{ secrets.BASE_DOMAIN_STAGING }}
14+
SERVICE_PORT: 80
15+
16+
jobs:
17+
build:
18+
runs-on: ubuntu-latest
19+
name: Build
20+
steps:
21+
- uses: actions/checkout@v2
22+
- name: Build
23+
uses: andersinno/kolga-build-action@v2
24+
env:
25+
DOCKER_IMAGE_NAME: ${{ env.REPO_NAME }}-review
26+
DOCKER_BUILD_ARG_REACT_APP_ENVIRONMENT: 'review'
27+
DOCKER_BUILD_ARG_REACT_APP_OIDC_AUTHORITY: 'https://tunnistamo.test.kuva.hel.ninja'
28+
DOCKER_BUILD_ARG_REACT_APP_OIDC_CLIENT_ID: 'https://api.hel.fi/auth/kukkuu-admin-ui'
29+
DOCKER_BUILD_ARG_REACT_APP_OIDC_SCOPE: 'openid profile https://api.hel.fi/auth/kukkuu'
30+
DOCKER_BUILD_ARG_REACT_APP_KUKKUU_API_OIDC_SCOPE: 'https://api.hel.fi/auth/kukkuu'
31+
DOCKER_BUILD_ARG_REACT_APP_API_URI: 'https://kukkuu.test.kuva.hel.ninja/graphql'
32+
DOCKER_BUILD_ARG_REACT_APP_SENTRY_DSN: 'https://c89ee3f57dc94ffd940d1df1a353b97f@sentry.hel.ninja/55'
33+
34+
review:
35+
runs-on: ubuntu-latest
36+
needs: build
37+
name: Review
38+
steps:
39+
- uses: actions/checkout@v2
40+
- uses: andersinno/kolga-setup-action@v2
41+
42+
- name: Deploy
43+
uses: andersinno/kolga-deploy-action@v2
44+
env:
45+
ENVIRONMENT_URL: https://${{ env.K8S_NAMESPACE }}.${{ env.BASE_DOMAIN }}
46+
DOCKER_IMAGE_NAME: ${{ env.REPO_NAME }}-review

‎.github/workflows/staging.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Build & Staging
2+
on:
3+
push:
4+
branches:
5+
- develop
6+
7+
env:
8+
CONTAINER_REGISTRY: ghcr.io
9+
CONTAINER_REGISTRY_USER: ${{ secrets.GHCR_CONTAINER_REGISTRY_USER }}
10+
CONTAINER_REGISTRY_PASSWORD: ${{ secrets.GHCR_TOKEN }}
11+
CONTAINER_REGISTRY_REPO: ghcr.io/city-of-helsinki/${{ github.event.repository.name }}
12+
REPO_NAME: ${{ github.event.repository.name }}
13+
KUBECONFIG_RAW: ${{ secrets.KUBECONFIG_RAW_STAGING }}
14+
BUILD_ARTIFACT_FOLDER: 'build_artifacts'
15+
SERVICE_ARTIFACT_FOLDER: 'service_artifacts'
16+
SERVICE_PORT: 80
17+
18+
jobs:
19+
build:
20+
runs-on: ubuntu-latest
21+
name: Build
22+
steps:
23+
- uses: actions/checkout@v2
24+
- name: Build
25+
uses: andersinno/kolga-build-action@v2
26+
env:
27+
DOCKER_IMAGE_NAME: ${{ env.REPO_NAME }}-staging
28+
DOCKER_BUILD_ARG_REACT_APP_ENVIRONMENT: 'staging'
29+
DOCKER_BUILD_ARG_REACT_APP_OIDC_AUTHORITY: 'https://tunnistamo.test.kuva.hel.ninja'
30+
DOCKER_BUILD_ARG_REACT_APP_OIDC_CLIENT_ID: 'https://api.hel.fi/auth/kukkuu-admin-ui'
31+
DOCKER_BUILD_ARG_REACT_APP_OIDC_SCOPE: 'openid profile https://api.hel.fi/auth/kukkuu'
32+
DOCKER_BUILD_ARG_REACT_APP_KUKKUU_API_OIDC_SCOPE: 'https://api.hel.fi/auth/kukkuu'
33+
DOCKER_BUILD_ARG_REACT_APP_API_URI: 'https://kukkuu.test.kuva.hel.ninja/graphql'
34+
DOCKER_BUILD_ARG_REACT_APP_SENTRY_DSN: 'https://c89ee3f57dc94ffd940d1df1a353b97f@sentry.hel.ninja/55'
35+
36+
staging:
37+
runs-on: ubuntu-latest
38+
needs: build
39+
name: Staging
40+
steps:
41+
- uses: actions/checkout@v2
42+
- uses: andersinno/kolga-setup-action@v2
43+
44+
- name: Deploy
45+
uses: andersinno/kolga-deploy-action@v2
46+
with:
47+
track: 'staging'
48+
env:
49+
K8S_NAMESPACE: ${{ secrets.K8S_NAMESPACE_STAGING }}
50+
ENVIRONMENT_URL: https://${{ secrets.ENVIRONMENT_URL_STAGING }}
51+
DOCKER_IMAGE_NAME: ${{ env.REPO_NAME }}-staging

‎.github/workflows/stop_review.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Stop Review
2+
on:
3+
pull_request:
4+
types: [closed]
5+
6+
env:
7+
KUBECONFIG_RAW: ${{ secrets.KUBECONFIG_RAW }}
8+
9+
jobs:
10+
stop_review:
11+
runs-on: ubuntu-latest
12+
name: Stop Review
13+
steps:
14+
- uses: andersinno/kolga-setup-action@v2
15+
16+
- name: Stop Review
17+
uses: andersinno/kolga-review-cleanup-action@v2
18+
with:
19+
namespace: ${{ env.K8S_NAMESPACE }}
20+

‎.travis.yml‎

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

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22

33
## [Unreleased]
44

5+
## [1.5.0] - 2020-12-17
6+
7+
### Added
8+
9+
- [#109](https://github.com/City-of-Helsinki/kukkuu-admin/pull/109) View for viewing event group details
10+
- [#110](https://github.com/City-of-Helsinki/kukkuu-admin/pull/110) Breadcrumbs to event and event group views
11+
- [#111](https://github.com/City-of-Helsinki/kukkuu-admin/pull/111) Event group creation view
12+
- [#111](https://github.com/City-of-Helsinki/kukkuu-admin/pull/111) Event group editing view
13+
- [#115](https://github.com/City-of-Helsinki/kukkuu-admin/pull/115) View for adding an event to an event group
14+
- [#117](https://github.com/City-of-Helsinki/kukkuu-admin/pull/117) Breadcrumb to occurrence detail view
15+
- [#118](https://github.com/City-of-Helsinki/kukkuu-admin/pull/118) Event group publish button
16+
- [#127](https://github.com/City-of-Helsinki/kukkuu-admin/pull/127) Event ready button for event in an event group
17+
18+
### Changed
19+
20+
- [#107](https://github.com/City-of-Helsinki/kukkuu-admin/pull/107) apollo-client version to 3.0 branch
21+
- [#112](https://github.com/City-of-Helsinki/kukkuu-admin/pull/112) Use GitHub Actions instead of Travis
22+
523
## [1.4.0] - 2020-11-11
624

725
### Added

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![codecov](https://codecov.io/gh/City-of-Helsinki/kukkuu-admin/branch/develop/graph/badge.svg)](https://codecov.io/gh/City-of-Helsinki/kukkuu-admin)
2-
[![Build Status](https://travis-ci.org/City-of-Helsinki/kukkuu-admin.svg?branch=develop)](https://travis-ci.org/City-of-Helsinki/kukkuu-admin)
3-
2+
![Build status](https://github.com/City-of-Helsinki/kukkuu-admin/workflows/CI/badge.svg)
3+
![Browser tests](https://github.com/City-of-Helsinki/kukkuu-admin/workflows/Browser%20tests/badge.svg)
44

55
# Staff interface for Kulttuurin kummilapset / Culture Kids
66

@@ -14,7 +14,7 @@ https://github.com/City-of-Helsinki/kukkuu-ui/
1414
## Deployments
1515

1616
Production environment:
17-
TODO
17+
https://kummilapset.hel.fi
1818

1919
Testing environment:
2020
https://kukkuu-admin.test.kuva.hel.ninja/
@@ -137,4 +137,4 @@ Travis is configured to run a cron job daily. The browser tests are hooked to th
137137

138138
## Debugging
139139

140-
See instructions in the sister project: https://github.com/City-of-Helsinki/kukkuu-ui/
140+
See instructions in the sister project: https://github.com/City-of-Helsinki/kukkuu-ui/

0 commit comments

Comments
 (0)