Skip to content

Commit

Permalink
Merge branch 'main' into upgrade-martin
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-markl authored May 14, 2024
2 parents b4e62da + 050f056 commit 7f286c2
Show file tree
Hide file tree
Showing 9 changed files with 387 additions and 128 deletions.
145 changes: 145 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,7 @@ jobs:
command: |
curl https://webhook.entitlementcard-test.tuerantuer.org/hooks/install-<< parameters.bundle >>-$EAK_WEBHOOK
name: Install package via webhook
- notify
notify_release:
docker:
- image: cimg/node:19.1.0
Expand Down Expand Up @@ -1017,6 +1018,9 @@ parameters:
run_deliver_production_backend_administration:
default: false
type: boolean
run_delivery_beta_all:
default: false
type: boolean
run_delivery_beta_native:
default: false
type: boolean
Expand Down Expand Up @@ -1112,6 +1116,147 @@ workflows:
- equal:
- main
- << pipeline.git.branch >>
deliver_beta_all:
jobs:
- bump_version:
context:
- deliverino
prepare_delivery: true
- check
- check_frontend:
requires:
- check
- build_android:
buildConfig: bayern
context:
- credentials-repo
- credentials-ehrenamtskarte
flutterFlavor: Bayern
name: build_android_bayern
requires:
- bump_version
- check_frontend
- deliver_android:
buildConfig: bayern
context:
- tuerantuer-google-play
name: deliver_android_bayern
production_delivery: false
requires:
- build_android_bayern
- build_android:
buildConfig: nuernberg
context:
- credentials-repo
- credentials-ehrenamtskarte
flutterFlavor: Nuernberg
name: build_android_nuernberg
requires:
- bump_version
- check_frontend
- deliver_android:
buildConfig: nuernberg
context:
- tuerantuer-google-play
name: deliver_android_nuernberg
production_delivery: false
requires:
- build_android_nuernberg
- build_ios:
buildConfig: bayern
context:
- tuerantuer-apple
- fastlane-match
flutterFlavor: Bayern
name: build_ios_bayern
requires:
- bump_version
- check_frontend
- deliver_ios:
buildConfig: bayern
context:
- tuerantuer-apple
name: deliver_bayern_ios
production_delivery: false
requires:
- build_ios_bayern
- build_ios:
buildConfig: nuernberg
context:
- tuerantuer-apple
- fastlane-match
flutterFlavor: Nuernberg
name: build_ios_nuernberg
requires:
- bump_version
- check_frontend
- deliver_ios:
buildConfig: nuernberg
context:
- tuerantuer-apple
name: deliver_nuernberg_ios
production_delivery: false
requires:
- build_ios_nuernberg
- notify_release:
context:
- deliverino
production_delivery: false
requires:
- deliver_android_bayern
- deliver_android_nuernberg
- deliver_ios_bayern
- deliver_ios_nuernberg
- check_administration
- build_administration:
requires:
- check_administration
- bump_version
- pack_administration:
requires:
- build_administration
- build_martin
- check_backend
- build_backend:
requires:
- check_backend
- pack_backend:
requires:
- build_backend
- bump_version
- check_health_backend:
requires:
- pack_backend
- pack_martin:
requires:
- build_martin
- bump_version
- pack_meta:
requires:
- bump_version
- deliver_to_server:
bundle: administration
context:
- credentials-ehrenamtskarte
name: deliver_administration_staging
production: false
requires:
- pack_administration
- check_health_backend
- pack_martin
- pack_meta
- deliver_to_server:
bundle: backend
context:
- credentials-ehrenamtskarte
name: deliver_backend_staging
production: false
requires:
- pack_administration
- check_health_backend
- pack_martin
- pack_meta
when: << pipeline.parameters.run_delivery_beta_all >>
deliver_beta_backend_administration:
jobs:
- bump_version:
Expand Down
3 changes: 3 additions & 0 deletions .circleci/src/@common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,8 @@ parameters:
default: false
type: boolean
run_promote_backend_administration:
default: false
type: boolean
run_delivery_beta_all:
default: false
type: boolean
2 changes: 1 addition & 1 deletion .circleci/src/jobs/deliver_to_server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ steps:
name: Install package via webhook
command: |
curl https://webhook.entitlementcard-test.tuerantuer.org/hooks/install-<< parameters.bundle >>-$EAK_WEBHOOK
# - notify
- notify
140 changes: 140 additions & 0 deletions .circleci/src/workflows/deliver_beta_all.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
when: << pipeline.parameters.run_delivery_beta_all >>
jobs:
- bump_version:
prepare_delivery: true
context:
- deliverino
- check
- check_frontend:
requires:
- check
- build_android:
name: build_android_bayern
buildConfig: "bayern"
flutterFlavor: "Bayern"
requires:
- bump_version
- check_frontend
context:
- credentials-repo
- credentials-ehrenamtskarte
- deliver_android:
name: deliver_android_bayern
buildConfig: "bayern"
context:
- tuerantuer-google-play
production_delivery: false
requires:
- build_android_bayern
- build_android:
name: build_android_nuernberg
buildConfig: "nuernberg"
flutterFlavor: "Nuernberg"
requires:
- bump_version
- check_frontend
context:
- credentials-repo
- credentials-ehrenamtskarte
- deliver_android:
name: deliver_android_nuernberg
buildConfig: "nuernberg"
context:
- tuerantuer-google-play
production_delivery: false
requires:
- build_android_nuernberg
- build_ios:
name: build_ios_bayern
buildConfig: "bayern"
flutterFlavor: "Bayern"
requires:
- bump_version
- check_frontend
context:
- tuerantuer-apple
- fastlane-match
- deliver_ios:
name: deliver_bayern_ios
buildConfig: bayern
context:
- tuerantuer-apple
production_delivery: false
requires:
- build_ios_bayern
- build_ios:
name: build_ios_nuernberg
buildConfig: "nuernberg"
flutterFlavor: "Nuernberg"
requires:
- bump_version
- check_frontend
context:
- tuerantuer-apple
- fastlane-match
- deliver_ios:
name: deliver_nuernberg_ios
buildConfig: nuernberg
context:
- tuerantuer-apple
production_delivery: false
requires:
- build_ios_nuernberg
- notify_release:
production_delivery: false
context:
- deliverino
requires:
- deliver_android_bayern
- deliver_android_nuernberg
- deliver_ios_bayern
- deliver_ios_nuernberg
- check_administration
- build_administration:
requires:
- check_administration
- bump_version
- pack_administration:
requires:
- build_administration
- build_martin
- check_backend
- build_backend:
requires:
- check_backend
- pack_backend:
requires:
- build_backend
- bump_version
- check_health_backend:
requires:
- pack_backend
- pack_martin:
requires:
- build_martin
- bump_version
- pack_meta:
requires:
- bump_version
- deliver_to_server:
name: deliver_administration_staging
production: false
bundle: administration
context:
- credentials-ehrenamtskarte
requires:
- pack_administration
- check_health_backend
- pack_martin
- pack_meta
- deliver_to_server:
name: deliver_backend_staging
production: false
bundle: backend
context:
- credentials-ehrenamtskarte
requires:
- pack_administration
- check_health_backend
- pack_martin
- pack_meta
42 changes: 37 additions & 5 deletions backend/src/main/resources/graphiql/index.html
Original file line number Diff line number Diff line change
@@ -1,23 +1,55 @@
<!--
* Copyright (c) 2021 GraphQL Contributors
* All rights reserved.
*
* This source code is licensed under the license found in the
* LICENSE file in the root directory of this source tree.
-->
<!doctype html>
<html>
<html lang="en">
<head>
<title>GraphiQL</title>
<style>
body {
height: 100%;
margin: 0;
width: 100%;
overflow: hidden;
}

#graphiql {
height: 100vh;
}
</style>
<script crossorigin src="https://unpkg.com/react@16/umd/react.development.js"></script>
<script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.development.js"></script><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/graphiql/1.0.6/graphiql.css" integrity="sha512-ITcqvcmJOrZ+FOQQ2TQspONfh2JEr8MfguKQ+S+6KdsGJvzAqkxWD+GWMCNgat8zXFtYOdSZliOJXQ4Lf7RUug==" crossorigin="anonymous" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/graphiql/1.0.6/graphiql.min.js" integrity="sha512-rHuzgszz0hWOtqRSaX2zUaw5AMoP5foqfaXTirJNt9LScJS70CevCc/W6yOEgF2JMMS52AIdB22xz4UaN8O2Gg==" crossorigin="anonymous"></script>
<!--
This GraphiQL example depends on Promise and fetch, which are available in
modern browsers, but can be "polyfilled" for older browsers.
GraphiQL itself depends on React DOM.
If you do not want to rely on a CDN, you can host these files locally or
include them directly in your favored resource bundler.
-->
<script crossorigin src="https://unpkg.com/[email protected]/umd/react.development.js"></script>
<script crossorigin src="https://unpkg.com/[email protected]/umd/react-dom.development.js"></script>
<!--
These two files can be found in the npm module, however you may wish to
copy them directly into your environment, or perhaps include them in your
favored resource bundler.
-->
<script src="https://unpkg.com/[email protected]/graphiql.min.js" type="application/javascript"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected]/graphiql.min.css"/>
<!--
These are imports for the GraphIQL Explorer plugin.
-->
<script crossorigin src="https://unpkg.com/@graphiql/[email protected]/dist/index.umd.js"></script>

<link rel="stylesheet" href="https://unpkg.com/@graphiql/[email protected]/dist/style.css"/>
</head>

<body>
<div id="graphiql">Loading...</div>
<script defer="defer" src="./renderExample.js"></script>
<script type="application/javascript">
window.GraphQLVersion = "3.2.1"
</script>
<script defer src="renderExample.js" type="application/javascript"></script>
</body>
</html>
Loading

0 comments on commit 7f286c2

Please sign in to comment.