Skip to content

Commit

Permalink
Merge pull request #67 from sap-contributions/feat/backend-service
Browse files Browse the repository at this point in the history
Resolved conflict
  • Loading branch information
ieuna authored Jun 24, 2024
2 parents 1053ab7 + 13e3443 commit 6561a72
Show file tree
Hide file tree
Showing 40 changed files with 5,782 additions and 3,916 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-playground.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
npm run build -- --base-href=/tutorial-resources/policy-playground/
- name: deploy to gh-pages
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./edc-policy-playground/dist
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/run-terraform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ jobs:
steps:

- name: "Setup Helm"
uses: azure/setup-helm@v3.5
uses: azure/setup-helm@v4
with:
version: v3.8.1

- name: "Setup Kubectl"
uses: azure/setup-kubectl@v3.2
uses: azure/setup-kubectl@v4

- uses: actions/checkout@v4
- name: "Create k8s Kind Cluster"
uses: helm/kind-action@v1.9.0
uses: helm/kind-action@v1.10.0
with:
config: mxd/kind.config.yaml
cluster_name: mxd
Expand Down
37 changes: 29 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,54 @@ where these companies will be able to participate quickly and with little IT
infrastructure investment. Tractus-X is meant to be the PoC project of the
Catena-X alliance focusing on parts traceability.

* <https://projects.eclipse.org/projects/automotive.tractusx>
* https://projects.eclipse.org/projects/automotive.tractusx

## Project licenses

The Tractus-X project uses the following licenses:

* Apache-2.0 for code
* CC-BY-4.0 for non-code

## Terms of Use

This repository is subject to the Terms of Use of the Eclipse Foundation

* https://www.eclipse.org/legal/termsofuse.php

## Developer resources

Information regarding source code management, builds, coding standards, and
more.

* <https://projects.eclipse.org/projects/automotive.tractusx/developer>
* https://projects.eclipse.org/projects/automotive.tractusx/developer

Getting started:

* https://eclipse-tractusx.github.io/docs/developer

The project maintains the following source code repositories

* https://github.com/eclipse-tractusx/tutorial-resources

The project maintains the source code repositories in the following GitHub organization:

* <https://github.com/eclipse-tractusx/>
* https://github.com/eclipse-tractusx/

## Eclipse Development Process

This Eclipse Foundation open project is governed by the Eclipse Foundation
Development Process and operates under the terms of the Eclipse IP Policy.

* <https://eclipse.org/projects/dev_process>
* <https://www.eclipse.org/org/documents/Eclipse_IP_Policy.pdf>
* https://eclipse.org/projects/dev_process
* https://www.eclipse.org/org/documents/Eclipse_IP_Policy.pdf

## Eclipse Contributor Agreement

In order to be able to contribute to Eclipse Foundation projects you must
electronically sign the Eclipse Contributor Agreement (ECA).

* <http://www.eclipse.org/legal/ECA.php>
* http://www.eclipse.org/legal/ECA.php

The ECA provides the Eclipse Foundation with a permanent record that you agree
that each of your contributions will comply with the commitments documented in
Expand All @@ -49,10 +70,10 @@ the email address matching the "Author" field of your contribution's Git commits
fulfills the DCO's requirement that you sign-off on your contributions.

For more information, please see the Eclipse Committer Handbook:
<https://www.eclipse.org/projects/handbook/#resources-commit>
https://www.eclipse.org/projects/handbook/#resources-commit

## Contact

Contact the project developers via the project's "dev" list.

* <https://accounts.eclipse.org/mailing-list/tractusx-dev>
* https://accounts.eclipse.org/mailing-list/tractusx-dev
949 changes: 481 additions & 468 deletions DEPENDENCIES

Large diffs are not rendered by default.

Loading

0 comments on commit 6561a72

Please sign in to comment.