Skip to content

Commit

Permalink
Merge branch 'refs/heads/dev' into feature/cypress-all-inputs
Browse files Browse the repository at this point in the history
# Conflicts:
#	digiwf-cypress/cypress.config.js
#	digiwf-cypress/cypress/components/form.js
#	digiwf-cypress/cypress/components/nav.js
#	digiwf-cypress/cypress/components/pagination.js
#	digiwf-cypress/cypress/components/task.js
#	digiwf-cypress/cypress/e2e/1-example-usertask.cy.js
#	digiwf-cypress/cypress/pages/processes/exampleUserTaskStart.js
  • Loading branch information
simonhir committed Jun 24, 2024
2 parents fd77335 + 5c12c32 commit ce77560
Show file tree
Hide file tree
Showing 13 changed files with 298 additions and 194 deletions.
10 changes: 6 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
### Description

<!-- Brief explanation of the changes and their impact -->

### Reference
Expand All @@ -7,16 +8,17 @@ Issues: #xxx

### Screenshots (If UI changed)


### Check-List

- [ ] All Acceptance criteria of user story are met
- [ ] Accessibility was considered and tested (On UI Change)
- [ ] JUnit tests are written (60% CodeCov)
- [ ] [Internal Review]([https://github.com/it-at-m/digiwf-core/blob/dev/CHANGELOG.md](https://confluence.muenchen.de/display/MPdZ/Review+-+DigiWF)) is maintained
- [ ] Documentations [external](https://github.com/it-at-m/digiwf-core/tree/dev/docs) and [internal](https://wiki.muenchen.de/betriebshandbuch/index.php?title=DigiWF&sfr=betriebshandbuch) are completed
- [ ] [Internal Review](https://confluence.muenchen.de/display/MPdZ/Review+-+DigiWF) is maintained
- [ ] Documentations [external](https://github.com/it-at-m/digiwf-core/tree/dev/docs)
and [internal](https://wiki.muenchen.de/betriebshandbuch/index.php?title=DigiWF&sfr=betriebshandbuch) are completed
- [ ] Smoketest successful (Manual E2E-Test depending on Change)
- [ ] No waste on Branch left (e.g. `console.logs`)
- [ ] [Board](https://app.zenhub.com/workspaces/digiwf-621f70bf50ea1100120b7e93/board) is up-to-date
- [ ] Internal Services / Artifacts updated (Depending on Change - See [Dependency Graph](https://wiki.muenchen.de/betriebshandbuch/wiki/DigiWF#Abh.C3.A4ngigkeiten)
- [ ] Internal Services / Artifacts updated (Depending on Change -
See [Dependency Graph](https://wiki.muenchen.de/betriebshandbuch/wiki/DigiWF#Abh.C3.A4ngigkeiten)
- [ ] Openshift environments are prepared (Secrets, etc.) and release-issue is maintained
4 changes: 2 additions & 2 deletions .github/workflows/workflow-build-apps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ jobs:

- name: Build and push tasklist
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-apps/packages/apps/digiwf-tasklist
push: true
tags: itatm/digiwf-tasklist:${{ inputs.release-version }}

- name: Build and push webcomponent
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-apps/packages/apps/digiwf-webcomponent
push: true
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/workflow-build-services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,103 +107,103 @@ jobs:

- name: Build and push connector
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-connector/digiwf-camunda-connector-service
push: true
tags: itatm/digiwf-camunda-connector-service:${{ inputs.release-version }}

- name: Build and push gateway
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-gateway
push: true
tags: itatm/digiwf-gateway:${{ inputs.release-version }}

- name: Build and push cosys
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-service
push: true
tags: itatm/digiwf-cosys-integration-service:${{ inputs.release-version }}

- name: Build and push email integration
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service
push: true
tags: itatm/digiwf-email-integration-service:${{ inputs.release-version }}

- name: Build and push alw-integration
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-service
push: true
tags: itatm/digiwf-alw-integration-service:${{ inputs.release-version }}

- name: Build and push s3-integration
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service
push: true
tags: itatm/digiwf-s3-integration-service:${{ inputs.release-version }}

- name: Build and push oss engine
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-engine/digiwf-engine-service
push: true
tags: itatm/digiwf-engine-service-community:${{ inputs.release-version }}

- name: Build and push tasklist backend
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-task/digiwf-tasklist-service
push: true
tags: itatm/digiwf-tasklist-backend-service:${{ inputs.release-version }}

- name: Build and push alw dms integration
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-service
push: true
tags: itatm/digiwf-alw-dms-integration-service:${{ inputs.release-version }}

- name: Build and push mucs dms integration
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-integrations/digiwf-dms-integration/digiwf-dms-integration-service
push: true
tags: itatm/digiwf-mucs-dms-integration-service:${{ inputs.release-version }}

- name: Build and push ok ewo integration
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-integrations/digiwf-okewo-integration/digiwf-okewo-integration-service
push: true
tags: itatm/digiwf-okewo-integration-service:${{ inputs.release-version }}

- name: Build and push address-integration
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-integrations/digiwf-address-integration/digiwf-address-integration-service
push: true
tags: itatm/digiwf-address-integration-service:${{ inputs.release-version }}

- name: Build and push ticket-integration
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-integrations/digiwf-ticket-integration/digiwf-ticket-integration-service
push: true
Expand Down Expand Up @@ -260,23 +260,23 @@ jobs:

- name: Build and push engine
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-engine/digiwf-engine-service
push: true
tags: itatm/digiwf-engine-service:${{ inputs.release-version }}

- name: Build and push engine rest
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-engine/digiwf-engine-rest-service
push: true
tags: itatm/digiwf-engine-rest-service:${{ inputs.release-version }}

- name: Build and push optimize
if: inputs.build-images == true
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: ./digiwf-libs/digiwf-optimize-plugins
push: true
Expand Down
128 changes: 0 additions & 128 deletions CHANGELOG.md

This file was deleted.

Loading

0 comments on commit ce77560

Please sign in to comment.