Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
stewsk authored Nov 19, 2024
2 parents f1e26dc + 32b6959 commit 069a7c1
Show file tree
Hide file tree
Showing 21 changed files with 3,264 additions and 1,874 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deploy-btp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ jobs:
ui_app_url: ${{ steps.deploy.outputs.url }}

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
- uses: actions/cache@v2
- uses: actions/cache@v4
id: cache
with:
path: ${{ inputs.mtar-dir }}/${{ inputs.mtar-file }}
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ jobs:
java-version: [17,20]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Java ${{ matrix.java-version }}
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: 'sapmachine'

- name: Build with Maven
run: mvn -B clean verify
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,17 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [20.x, 18.x]
node-version: [22.x, 18.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- run: npm i @sap/cds-dk typescript tsx
- run: npm ci
- run: npx cds-typer "*"
- run: npm run lint
- run: npm run build --if-present
- run: npm run test
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,5 @@ dist/
# Experimental
xxx_*
xxx/*

@cds-models
18 changes: 17 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,23 @@ You can also use the ALP with the standard OData parser, but then some features
In the root folder of your project, run
```
npm ci
cds watch
cd watch
```

#### Typescript

There also is a typescript variant of the Node.js custom handlers.

Prerequisite:
```
npm i -g @sap/cds-dk typescript tsx
```

In the root folder of your project, run
```
npm ci
npx cds-typer "*"
cds-tsx watch
```

### Build and Run - Java Backend
Expand Down
Loading

0 comments on commit 069a7c1

Please sign in to comment.