Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .github/actions/cf-bind/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,12 @@ runs:
sleep 10
done

- name: Install @sap/cds-dk
shell: bash
run: |
npm i -g @sap/cds-dk@9.9.1
echo "$(npm config get prefix)/bin" >> "${GITHUB_PATH}"

- name: Install CDS dependencies
shell: bash
run: npm ci
working-directory: integration-tests/mtx-local
run: |
npm ci
echo "$(pwd)/node_modules/.bin" >> "${GITHUB_PATH}"

- name: Bind objectstore
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: CI - MAIN

env:
MAVEN_VERSION: "3.9.12"
MAVEN_VERSION: "3.9.16"

on:
workflow_dispatch:
Expand Down Expand Up @@ -29,7 +29,7 @@ jobs:
scan_mode: FULL

build-and-test:
uses: cap-java/cds-feature-attachments/.github/workflows/pipeline.yml@main
uses: ./.github/workflows/pipeline.yml
permissions:
contents: read
security-events: write
Expand Down
24 changes: 10 additions & 14 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Reusable Workflow

env:
MAVEN_VERSION: "3.9.12"
MAVEN_VERSION: "3.9.16"

on:
workflow_call:
Expand All @@ -20,7 +20,7 @@ jobs:
- name: Set up Java
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
with:
java-version: "17"
java-version: "21"
distribution: sapmachine
cache: maven

Expand All @@ -41,7 +41,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-version: [17, 21]
java-version: [21, 25]
steps:
- name: Checkout
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
Expand All @@ -58,12 +58,8 @@ jobs:
with:
maven-version: ${{ env.MAVEN_VERSION }}

- name: Install @sap/cds-dk
run: npm i -g @sap/cds-dk@9.9.1
shell: bash

- name: Run Tests
run: mvn test -ntp -B -P skip-integration-tests -Dcds.install-node.skip
run: mvn test -ntp -B -pl cds-feature-attachments,storage-targets/cds-feature-attachments-fs,storage-targets/cds-feature-attachments-oss -am -Dcds.install-node.skip

integration-tests:
name: Integration Tests (Java ${{ matrix.java-version }}, ${{ matrix.auth-method }}, ${{ matrix.hyperscaler }})
Expand All @@ -74,15 +70,15 @@ jobs:
strategy:
fail-fast: false
matrix:
java-version: [17, 21]
java-version: [21, 25]
auth-method: [basic, mtls]
hyperscaler: [AWS, AZURE, GCP]
steps:
- name: Checkout
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6

- name: Bind CF Services
uses: cap-java/cds-feature-attachments/.github/actions/cf-bind@main
uses: ./.github/actions/cf-bind
with:
cf-api: ${{ secrets[format('CF_API_{0}', matrix.hyperscaler)] }}
cf-username: ${{ secrets.CF_USERNAME }}
Expand All @@ -92,7 +88,7 @@ jobs:
auth-method: ${{ matrix.auth-method }}

- name: Integration Tests
uses: cap-java/cds-feature-attachments/.github/actions/integration-tests@main
uses: ./.github/actions/integration-tests
with:
java-version: ${{ matrix.java-version }}
maven-version: ${{ env.MAVEN_VERSION }}
Expand All @@ -110,7 +106,7 @@ jobs:
fetch-depth: 0

- name: Bind CF Services
uses: cap-java/cds-feature-attachments/.github/actions/cf-bind@main
uses: ./.github/actions/cf-bind
with:
cf-api: ${{ secrets.CF_API_AWS }}
cf-username: ${{ secrets.CF_USERNAME }}
Expand All @@ -122,7 +118,7 @@ jobs:
- name: SonarQube Scan
uses: cap-java/.github/actions/scan-with-sonar@main
with:
java-version: 17
java-version: 21
maven-version: ${{ env.MAVEN_VERSION }}
sonarq-token: ${{ secrets.SONARQ_TOKEN }}
sonar-project-key: cds-feature-attachments
Expand Down Expand Up @@ -151,6 +147,6 @@ jobs:
- name: CodeQL Analysis
uses: cap-java/.github/actions/scan-with-codeql@main
with:
java-version: 17
java-version: 21
maven-version: ${{ env.MAVEN_VERSION }}
language: ${{ matrix.language }}
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
rapid_compare_mode: BOM_COMPARE # PRs might only be blocked by things they introduce, not by pre-existing issues that could have appeared in the main branch in the meantime

build-and-test:
uses: cap-java/cds-feature-attachments/.github/workflows/pipeline.yml@main
uses: ./.github/workflows/pipeline.yml
permissions:
actions: read
contents: read
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Deploy to Maven Central

env:
JAVA_VERSION: '17'
MAVEN_VERSION: '3.9.12'
JAVA_VERSION: '21'
MAVEN_VERSION: '3.9.16'

on:
release:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ target/
node_modules
package-lock.json
!integration-tests/mtx-local/package-lock.json
!cds-feature-attachments/package-lock.json
!integration-tests/package-lock.json

## PMD
.pmd
Expand Down
3 changes: 3 additions & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-Daether.connector.http.retryHandler.count=3
-Daether.connector.http.retryHandler.interval=1000
-Daether.connector.http.reuseConnections=false
Loading
Loading