Skip to content

Commit

Permalink
Merge pull request #311 from catenax-ng/main
Browse files Browse the repository at this point in the history
chore: version bumps and alignment of dash ip check
  • Loading branch information
ds-mwesener authored Oct 11, 2023
2 parents e5b2af6 + faec1d8 commit 9cfa7fe
Show file tree
Hide file tree
Showing 61 changed files with 1,377 additions and 1,260 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-branch_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER == ''
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: frontend
push: true
Expand All @@ -74,7 +74,7 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER != ''
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: frontend
push: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-main_backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER == ''
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand All @@ -80,7 +80,7 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER != ''
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-main_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER == ''
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: frontend
push: true
Expand All @@ -75,7 +75,7 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER != ''
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: frontend
push: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docker-image-tag-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER == ''
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: frontend
push: true
Expand All @@ -78,7 +78,7 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER != ''
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: frontend
push: true
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER == ''
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand All @@ -152,7 +152,7 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
if: env.DOCKER_HUB_USER != ''
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/helm-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ jobs:
version: v0.20.0

- name: Build & push Image App to KinD
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
tags: ${{ env.REGISTRY }}/${{ env.APP_NAME}}:${{ env.TAG }}

- name: Build & push Image Frontend to KinD
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: ./frontend
push: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request_backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build & Push docker image for GHCR ${{ env.GHCR_REGISTRY }}/${{ github.repository }}:${{ github.event.pull_request.head.sha }}
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,42 +17,42 @@ jobs:
run: echo HELM_VERSION=$(cat charts/traceability-foss/CHANGELOG.md | sed -n 's/.*\[\([0-9]\+\.[0-9]\+\.[0-9]\+\)\].*/\1/p' | head -n 1) >> $GITHUB_ENV

- name: Update Chart.yaml appVersion
uses: mikefarah/[email protected].1
uses: mikefarah/[email protected].2
with:
cmd: yq -i eval '.appVersion = "${{ github.ref_name }}"' charts/traceability-foss/Chart.yaml

- name: Update Chart.yaml version
uses: mikefarah/[email protected].1
uses: mikefarah/[email protected].2
with:
cmd: yq -i eval '.version = "${{ env.HELM_VERSION }}"' charts/traceability-foss/Chart.yaml

- name: Update frontend dependency version in Chart.yaml
uses: mikefarah/[email protected].1
uses: mikefarah/[email protected].2
with:
cmd: yq -i eval '.dependencies[0].version = "${{ env.HELM_VERSION }}"' charts/traceability-foss/Chart.yaml

- name: Update backend dependency version in Chart.yaml
uses: mikefarah/[email protected].1
uses: mikefarah/[email protected].2
with:
cmd: yq -i eval '.dependencies[1].version = "${{ env.HELM_VERSION }}"' charts/traceability-foss/Chart.yaml

- name: Update frontend version in frontend/Chart.yaml
uses: mikefarah/[email protected].1
uses: mikefarah/[email protected].2
with:
cmd: yq -i eval '.version = "${{ env.HELM_VERSION }}"' charts/traceability-foss/charts/frontend/Chart.yaml

- name: Update frontend appVersion in frontend/Chart.yaml
uses: mikefarah/[email protected].1
uses: mikefarah/[email protected].2
with:
cmd: yq -i eval '.appVersion = "${{ github.ref_name }}"' charts/traceability-foss/charts/frontend/Chart.yaml

- name: Update backend version in backend/Chart.yaml
uses: mikefarah/[email protected].1
uses: mikefarah/[email protected].2
with:
cmd: yq -i eval '.version = "${{ env.HELM_VERSION }}"' charts/traceability-foss/charts/backend/Chart.yaml

- name: Update backend appVersion in frontend/Chart.yaml
uses: mikefarah/[email protected].1
uses: mikefarah/[email protected].2
with:
cmd: yq -i eval '.appVersion = "${{ github.ref_name }}"' charts/traceability-foss/charts/backend/Chart.yaml

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ jobs:
cache: 'maven'

- name: Locally build docker image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: false
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Added global search field to other parts
- Added possiblity to provide multiple semanticDataModels in filter
- Added two new columns for amount of open Notifications per part in part views (asBuilt)
- Added test dependencies to dash ip check

### Changed
- updated IRS helm chart from 6.6.1 to 6.7.2
- Updated policy related logic to reflect IRS changes

- Moved response handling from the backend folder to the model folder, addressing a TODO item.
- replaced StartQualityAlertRequest with StartQualityNotification
- updated mikefarah/yq from 4.35.1 to 4.35.2
- updated maven-site-plugin from 4.0.0-M5 to 4.0.0-M9
- updated testcontainer-postgresql from 1.17.6 to 1.19.0
- updated docker/build-push-action from 4 to 5
- Updated user manual to reflect current state of the part views

### Removed
- Owner filter and replaced it with the new filter query param
- Removed profile based feature flag for investigations / alerts

## [7.1.0 - 29.09.2023]
### Added
Expand Down
Loading

0 comments on commit 9cfa7fe

Please sign in to comment.