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
12 changes: 6 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@ updates:
directory: "/src/" # Location of package manifests
open-pull-requests-limit: 50
schedule:
interval: "daily"
interval: "weekly"
- package-ecosystem: "docker" # See documentation for possible values
directory: "/src/server-am" # Location of package manifests
schedule:
interval: "daily"
interval: "weekly"
- package-ecosystem: "docker" # See documentation for possible values
directory: "/src/server-cm" # Location of package manifests
schedule:
interval: "daily"
interval: "weekly"
- package-ecosystem: "docker" # See documentation for possible values
directory: "/src/server-rm" # Location of package manifests
schedule:
interval: "daily"
interval: "weekly"
- package-ecosystem: "docker" # See documentation for possible values
directory: "/src/server-qm" # Location of package manifests
schedule:
interval: "daily"
interval: "weekly"
- package-ecosystem: "github-actions" # See documentation for possible values
directory: "/" # Location of package manifests
open-pull-requests-limit: 30
schedule:
interval: "daily"
interval: "weekly"
97 changes: 77 additions & 20 deletions .github/workflows/maven-acceptance-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,18 @@ on:
lyoBranch:
description: 'Lyo branch to test on'
required: true
default: 'master'
default: 'main'
lyoRepo:
description: 'Lyo repository or fork'
required: true
default: 'eclipse/lyo'
default: 'eclipse-lyo/lyo'
comment:
description: 'comment, e.g. PR number'
default: 'n/a'

permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.lyoRepo }}-${{ github.event.inputs.lyoBranch }}
cancel-in-progress: false
Expand All @@ -43,29 +46,47 @@ jobs:
continue-on-error: ${{ matrix.experimental }}

steps:
- uses: actions/checkout@v7
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
with:
repository: "${{ github.event.inputs.lyoRepo }}"
ref: "${{ github.event.inputs.lyoBranch }}"
path: lyo-trunk
- uses: actions/checkout@v7
persist-credentials: false
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
with:
path: main
persist-credentials: false
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v6
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6
with:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.jdk }}
- uses: actions/cache@v6
- uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
with:
path: ~/.m2/repository
key: ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-
- name: Build Lyo locally (branch ${{ github.event.inputs.lyoBranch }})
run: mvn -B clean install --file lyo-trunk/pom.xml -DskipTests -Dmaven.javadoc.skip=true -P '!spotless' -P'!spotbugs'
run: mvn -B --no-transfer-progress clean install --file lyo-trunk/pom.xml -P '!spotbugs,!spotless,!enforcer' -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dcyclonedx.skip=true
- name: Detect checked-out Lyo version
id: lyo-version
working-directory: ${{ github.workspace }}
shell: bash
run: |
mvn -B --no-transfer-progress --non-recursive --file lyo-trunk/pom.xml \
org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate \
-Dexpression=project.version -Doutput="$RUNNER_TEMP/lyo-version.txt"
lyo_version="$(cat "$RUNNER_TEMP/lyo-version.txt")"
if [[ ! "$lyo_version" =~ ^[0-9][A-Za-z0-9._-]*$ ]]; then
echo "Invalid Lyo version: $lyo_version" >&2
exit 1
fi
printf 'version=%s\n' "$lyo_version" >> "$GITHUB_OUTPUT"
- name: Run tests on RefImpl
run: mvn -B -Pacceptance clean verify --file main/src/pom.xml
env:
LYO_VERSION: ${{ steps.lyo-version.outputs.version }}
run: mvn -B -Pacceptance clean verify --file main/src/pom.xml "-Dversion.lyo=$LYO_VERSION"


docker-compose-e2e:
Expand Down Expand Up @@ -93,29 +114,47 @@ jobs:
continue-on-error: ${{ matrix.experimental }}

steps:
- uses: actions/checkout@v7
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
with:
repository: "${{ github.event.inputs.lyoRepo }}"
ref: "${{ github.event.inputs.lyoBranch }}"
path: lyo-trunk
- uses: actions/checkout@v7
persist-credentials: false
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
with:
path: main
persist-credentials: false
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v6
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6
with:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.jdk }}
- uses: actions/cache@v6
- uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
with:
path: ~/.m2/repository
key: ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-
- name: Build Lyo locally (branch ${{ github.event.inputs.lyoBranch }})
run: mvn -B clean install --file lyo-trunk/pom.xml -DskipTests -Dmaven.javadoc.skip=true -P '!spotless'
run: mvn -B --no-transfer-progress clean install --file lyo-trunk/pom.xml -P '!spotbugs,!spotless,!enforcer' -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dcyclonedx.skip=true
- name: Detect checked-out Lyo version
id: lyo-version
working-directory: ${{ github.workspace }}
shell: bash
run: |
mvn -B --no-transfer-progress --non-recursive --file lyo-trunk/pom.xml \
org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate \
-Dexpression=project.version -Doutput="$RUNNER_TEMP/lyo-version.txt"
lyo_version="$(cat "$RUNNER_TEMP/lyo-version.txt")"
if [[ ! "$lyo_version" =~ ^[0-9][A-Za-z0-9._-]*$ ]]; then
echo "Invalid Lyo version: $lyo_version" >&2
exit 1
fi
printf 'version=%s\n' "$lyo_version" >> "$GITHUB_OUTPUT"
- name: Build with Maven
run: mvn -B package --file main/src/pom.xml
env:
LYO_VERSION: ${{ steps.lyo-version.outputs.version }}
run: mvn -B package --file main/src/pom.xml "-Dversion.lyo=$LYO_VERSION"
- name: Build and Start Docker Compose
working-directory: main/src/
run: |
Expand Down Expand Up @@ -156,31 +195,49 @@ jobs:
continue-on-error: ${{ matrix.experimental }}

steps:
- uses: actions/checkout@v7
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
with:
repository: "${{ github.event.inputs.lyoRepo }}"
ref: "${{ github.event.inputs.lyoBranch }}"
path: lyo-trunk
- uses: actions/checkout@v7
persist-credentials: false
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
with:
path: main
persist-credentials: false
- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v6
uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6
with:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.jdk }}
- uses: actions/cache@v6
- uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
with:
path: ~/.m2/repository
key: ${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-${{ matrix.jdk }}_${{ matrix.distribution }}-maven-
- name: Build Lyo locally (branch ${{ github.event.inputs.lyoBranch }})
working-directory: lyo-trunk/
run: mvn -B clean install -DskipTests -Dmaven.javadoc.skip=true -P '!spotless'
run: mvn -B --no-transfer-progress clean install -P '!spotbugs,!spotless,!enforcer' -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dcyclonedx.skip=true
- name: Detect checked-out Lyo version
id: lyo-version
working-directory: ${{ github.workspace }}
shell: bash
run: |
mvn -B --no-transfer-progress --non-recursive --file lyo-trunk/pom.xml \
org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate \
-Dexpression=project.version -Doutput="$RUNNER_TEMP/lyo-version.txt"
lyo_version="$(cat "$RUNNER_TEMP/lyo-version.txt")"
if [[ ! "$lyo_version" =~ ^[0-9][A-Za-z0-9._-]*$ ]]; then
echo "Invalid Lyo version: $lyo_version" >&2
exit 1
fi
printf 'version=%s\n' "$lyo_version" >> "$GITHUB_OUTPUT"
- name: Build with Maven
env:
LYO_VERSION: ${{ steps.lyo-version.outputs.version }}
working-directory: main/src/
run: mvn -B package -Pwith-jstl-impl
run: mvn -B package -Pwith-jstl-impl "-Dversion.lyo=$LYO_VERSION"
- name: Build and Start Docker Compose
working-directory: main/src/
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/maven-acceptance-wide.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
name: CI acceptance tests (more JDKs)

on:
schedule:
# run integration tests every Thursday
- cron: "31 06 * * 4"
# schedule:
# # run integration tests every Thursday
# - cron: "31 06 * * 4"
workflow_dispatch:

concurrency:
Expand Down
2 changes: 0 additions & 2 deletions src/refimpl-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,11 @@
<dependency>
<groupId>org.eclipse.lyo.trs</groupId>
<artifactId>trs-client</artifactId>
<version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.lyo</groupId>
<artifactId>oslc-domains</artifactId>
<version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion src/server-am/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@
<dependency>
<groupId>org.eclipse.lyo</groupId>
<artifactId>oslc-domains</artifactId>
<version>7.0.0-SNAPSHOT</version>
</dependency>

<!-- Swagger dependencies -->
Expand Down
1 change: 0 additions & 1 deletion src/server-cm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@
<dependency>
<groupId>org.eclipse.lyo</groupId>
<artifactId>oslc-domains</artifactId>
<version>7.0.0-SNAPSHOT</version>
</dependency>

<!-- Swagger dependencies -->
Expand Down
1 change: 0 additions & 1 deletion src/server-qm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@
<dependency>
<groupId>org.eclipse.lyo</groupId>
<artifactId>oslc-domains</artifactId>
<version>7.0.0-SNAPSHOT</version>
</dependency>

<!-- Swagger dependencies -->
Expand Down
1 change: 0 additions & 1 deletion src/server-rm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,6 @@
<dependency>
<groupId>org.eclipse.lyo</groupId>
<artifactId>oslc-domains</artifactId>
<version>7.0.0-SNAPSHOT</version>
</dependency>

<!-- Swagger dependencies -->
Expand Down
Loading