Skip to content

Commit

Permalink
Merge pull request #11 from catenax-ng/release/0.3.2
Browse files Browse the repository at this point in the history
Release version 0.3.2
  • Loading branch information
paullatzelsperger authored Mar 30, 2023
2 parents 8524e84 + 6ee8673 commit e0d8913
Show file tree
Hide file tree
Showing 94 changed files with 1,048 additions and 948 deletions.
13 changes: 10 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,35 @@ assignees: ''
---

## Describe the bug

_A clear and concise description of what the bug is._

### To Reproduce

_Steps to reproduce the behavior:_

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

### Expected behavior

_A clear and concise description of what you expected to happen._

### Screenshots/Error Messages

_If applicable, add screenshots and/or error messages to help explain your problem._

## Context Informations

_Add any other context about the probleme here._

- Used version: [e.g. Commit Hash]
- OS: [e.g. Mac OS (M1), Windows, Linux]
- Docker Version: [e.g. 20.10.12]
- `java --version`:
- OS: [e.g. Mac OS (M1), Windows, Linux]
- Docker Version: [e.g. 20.10.12]
- `java --version`:

## Possible Implementation

_You already know the root cause of the erroneous state and how to fix it? Feel free to share your thoughts._
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ assignees: ''

---

_If you are missing a feature or have an idea how to improve this project that should first be
_If you are missing a feature or have an idea how to improve this project that should first be
discussed, please feel free to open up a [discussion](https://github.com/eclipse-tractusx/tractusx-edc/discussions/categories/ideas)._

**Is your feature request related to a problem? Please describe.**
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
# Build
-
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
# Build
-
Expand Down Expand Up @@ -188,7 +188,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
# Build
-
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
- name: Import GPG Key
uses: crazy-max/ghaction-import-gpg@v1
Expand All @@ -257,6 +257,7 @@ jobs:
echo "Publishing Version $(grep -e "version" gradle.properties | cut -f2 -d"=") to Github Packages"
./gradlew publishAllPublicationsToGitHubPackagesRepository
env:
REPO: ${{ github.repository }}
GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
#REPO: ${{ github.repository }}
REPO: "catenax-ng/product-edc"
GITHUB_PACKAGE_USERNAME: ${{ secrets.TEMP_GHPKG_USER }}
GITHUB_PACKAGE_PASSWORD: ${{ secrets.TEMP_GHPKG_PASSWORD }}
14 changes: 7 additions & 7 deletions .github/workflows/business-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
-
name: Cache ContainerD Image Layers
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
- role: control-plane
extraMounts:
- hostPath: ${PWD}
containerPath: /srv/product-edc
containerPath: /srv/tractusx-edc
- hostPath: ${MAVEN_REPOSITORY}
containerPath: /srv/m2-repository
- hostPath: /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs
Expand Down Expand Up @@ -262,7 +262,7 @@ jobs:
{
"args": [
"-c",
"cd /product-edc && ./gradlew edc-tests:cucumber:test -Dcucumber=true"
"cd /tractusx-edc && ./gradlew edc-tests:cucumber:test -Dcucumber=true"
],
"command": [
"/bin/sh"
Expand Down Expand Up @@ -301,8 +301,8 @@ jobs:
"name": "edc-tests-cucumber",
"volumeMounts": [
{
"mountPath": "/product-edc",
"name": "product-edc"
"mountPath": "/tractusx-edc",
"name": "tractusx-edc"
},
{
"mountPath": "/root/.m2/repository",
Expand All @@ -316,9 +316,9 @@ jobs:
"volumes": [
{
"hostPath": {
"path": "/srv/product-edc"
"path": "/srv/tractusx-edc"
},
"name": "product-edc"
"name": "tractusx-edc"
},
{
"hostPath": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft-new-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
-
name: Bump version in gradle.properties
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'

- name: Import GPG Key
Expand All @@ -75,9 +75,10 @@ jobs:
echo "Publishing Version $(grep -e "version" gradle.properties | cut -f2 -d"=") to Github Packages"
./gradlew publishAllPublicationsToGithubPackagesRepository
env:
REPO: ${{ github.repository }}
GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
#REPO: ${{ github.repository }}
REPO: "catenax-ng/product-edc"
GITHUB_PACKAGE_USERNAME: ${{ secrets.TEMP_GHPKG_USER }}
GITHUB_PACKAGE_PASSWORD: ${{ secrets.TEMP_GHPKG_PASSWORD }}

# Release: Helm Charts
helm-release:
Expand Down Expand Up @@ -181,7 +182,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
-
name: Merge main back into develop and set new snapshot version
Expand All @@ -201,8 +202,7 @@ jobs:
SNAPSHOT_VERSION=$VERSION
# Persist the "version" in the gradle.properties
sed -i 's/version=.*/version=${{ github.event.inputs.version }}/g' gradle.properties
sed -i "s/version=.*/version=$SNAPSHOT_VERSION/g" gradle.properties
# Commit and push to origin develop
git add gradle.properties
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/veracode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
-
name: Verify proper formatting
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
# Build
-
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
# Build
-
Expand Down
24 changes: 18 additions & 6 deletions .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
-
name: Verify proper formatting
Expand All @@ -80,6 +80,18 @@ jobs:
./gradlew checkstyleMain checkstyleTest
echo "Running Checkstyle is currently a placeholder"
markdown-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Install mardkdownlint
run: npm install -g markdownlint-cli2

- name: Run markdownlint
run: |
markdownlint-cli2-config .markdownlint.yaml "**/*.md"
unit-tests:
runs-on: ubuntu-latest
needs: [verify-formatting]
Expand All @@ -91,7 +103,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'

- name: Run Unit tests
Expand All @@ -108,7 +120,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'

- name: Run Integration tests
Expand All @@ -125,7 +137,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'

- name: Run API tests
Expand All @@ -142,7 +154,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'

- name: Run E2E tests
Expand All @@ -165,7 +177,7 @@ jobs:
uses: actions/[email protected]
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
cache: 'gradle'
-
name: Cache SonarCloud packages
Expand Down
24 changes: 24 additions & 0 deletions .markdownlint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
# https://www.apache.org/licenses/LICENSE-2.0.
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# SPDX-License-Identifier: Apache-2.0


"default": true
# Do not restrict line length: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#MD013
"MD013": false
# Allow same content on headlines on siblings: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#MD024
"MD024":
"siblings_only": true
Loading

0 comments on commit e0d8913

Please sign in to comment.