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
92 changes: 48 additions & 44 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@

name: Continuous Integration

env:
NODE_VERSION: 26
JAVA_VERSION: 25

on:
workflow_dispatch:
push:
Expand All @@ -36,17 +40,17 @@ jobs:
permissions:
contents: read
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Setup node version [${{ vars.NODE_VERSION }}]
uses: actions/setup-node@v4
- name: Setup node version [${{ env.NODE_VERSION }}]
uses: actions/setup-node@v6
with:
node-version: ${{ vars.NODE_VERSION }}
node-version: ${{ env.NODE_VERSION }}

- uses: actions/setup-java@v4
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: ${{ vars.JAVA_VERSION }}
java-version: ${{ env.JAVA_VERSION }}

- name: Print Versions
run: |
Expand All @@ -56,7 +60,7 @@ jobs:
mvn -v

- name: Cache local Maven repository
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand All @@ -70,7 +74,7 @@ jobs:
mvn --batch-mode install -DskipTests

- name: upload service jar
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: service jar
path: ./service/target/*.jar
Expand Down Expand Up @@ -113,16 +117,16 @@ jobs:
sudo apt-get install -y postgresql-client
sudo psql --version

- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: actions/setup-node@v4
- uses: actions/setup-node@v6
with:
node-version: ${{ vars.NODE_VERSION }}
node-version: ${{ env.NODE_VERSION }}

- uses: actions/setup-java@v4
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: ${{ vars.JAVA_VERSION }}
java-version: ${{ env.JAVA_VERSION }}

- name: Print Versions
run: |
Expand All @@ -131,7 +135,7 @@ jobs:
node -v
google-chrome --version

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: service jar
path: ./service/target/
Expand All @@ -154,7 +158,7 @@ jobs:

- name: upload result artifacts
if: ${{ always() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: UI test artifacts (${{ matrix.container }})
path: |
Expand All @@ -174,7 +178,7 @@ jobs:

- name: Upload mochawesome results
if: ${{ always() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: mochawesome(${{ matrix.container }}).json
path: |
Expand All @@ -193,18 +197,18 @@ jobs:
# if: github.event_name == 'schedule-never'
needs: [ui-tests-against-postgres]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: actions/setup-node@v4
- uses: actions/setup-node@v6
with:
node-version: ${{ vars.NODE_VERSION }}
node-version: ${{ env.NODE_VERSION }}

- name: Print Versions
run: |
mvn --version

- name: Download Mochawesome Artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: e2e-tests/mochawesome-artifacts
pattern: mochawesome*
Expand All @@ -221,7 +225,7 @@ jobs:

- name: Upload Report
if: ${{ always() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: mochawesome-report
path: |
Expand Down Expand Up @@ -270,12 +274,12 @@ jobs:
sudo apt-get install -y postgresql-client
sudo psql --version

- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: actions/setup-java@v4
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: ${{ vars.JAVA_VERSION }}
java-version: ${{ env.JAVA_VERSION }}

- name: Print Versions
run: |
Expand All @@ -284,7 +288,7 @@ jobs:
node -v
google-chrome --version

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: service jar
path: ./service/target/
Expand Down Expand Up @@ -314,7 +318,7 @@ jobs:

- name: upload result artifacts
if: ${{ always() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: UI test with cypress dashboards (${{ matrix.container }})
path: |
Expand Down Expand Up @@ -355,22 +359,22 @@ jobs:
# Maps tcp port 5432 on service container to the host
- 5432:5432
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version: ${{ vars.NODE_VERSION }}
- uses: actions/setup-java@v4
node-version: ${{ env.NODE_VERSION }}
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: ${{ vars.JAVA_VERSION }}
java-version: ${{ env.JAVA_VERSION }}

- name: Print Versions
run: |
mvn --version
java -version

- name: Cache local Maven repository
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand All @@ -380,7 +384,7 @@ jobs:
# --- 1. Run Standard Tests & Isolate Output ---
- name: Run skills-service tests
env:
MAVEN_OPTS: -Xmx3G -XX:+UnlockDiagnosticVMOptions -XX:GCLockerRetryAllocationCount=100
MAVEN_OPTS: -Xmx3G -XX:+UnlockDiagnosticVMOptions
run: |
cd service
../.github/scripts/runSubsetOfServiceTests.sh -t 15 -c ${{ matrix.container }} -d "-Dspring.datasource.url=jdbc:postgresql://localhost:5432/skills -Dspring.datasource.username=postgres -Dspring.datasource.password=skillsPassword"
Expand All @@ -395,7 +399,7 @@ jobs:
- name: Run skills-service pki tests
env:
SPRING_PROFILES_ACTIVE: pki
MAVEN_OPTS: -Xmx3G -XX:+UnlockDiagnosticVMOptions -XX:GCLockerRetryAllocationCount=100
MAVEN_OPTS: -Xmx3G -XX:+UnlockDiagnosticVMOptions
run: |
cd service
../.github/scripts/runSubsetOfServiceTests.sh -t 15 -c ${{ matrix.container }} -d "-Dspring.datasource.url=jdbc:postgresql://localhost:5432/skills -Dspring.datasource.username=postgres -Dspring.datasource.password=skillsPassword -Dspring.cloud.aws.s3.enabled=false"
Expand All @@ -409,14 +413,14 @@ jobs:
# --- 3. Upload Isolated Artifact Bundles ---
- name: Upload Standard Surefire Artifacts
if: ${{ always() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: surefire-standard-${{ matrix.container }}
path: ./service/target/standard-reports

- name: Upload PKI Surefire Artifacts
if: ${{ always() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: surefire-pki-${{ matrix.container }}
path: ./service/target/pki-reports
Expand All @@ -428,26 +432,26 @@ jobs:
if: ${{ !cancelled() }}
needs: [service-against-postgresql]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version: ${{ vars.NODE_VERSION }}
- uses: actions/setup-java@v4
node-version: ${{ env.NODE_VERSION }}
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: ${{ vars.JAVA_VERSION }}
java-version: ${{ env.JAVA_VERSION }}

# Download standard XMLs into their own folder structure
- name: Download Standard Surefire Artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: service/target/combined-surefire-reports/standard
pattern: surefire-standard-*
merge-multiple: true

# Download PKI XMLs into their own folder structure
- name: Download PKI Surefire Artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
path: service/target/combined-surefire-reports/pki
pattern: surefire-pki-*
Expand All @@ -462,7 +466,7 @@ jobs:

- name: Upload Combined Surefire Report
if: ${{ always() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: surefire-report
path: |
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/generate-images-for-regression-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@

name: Generate Images for Regression Tests

env:
NODE_VERSION: 26
JAVA_VERSION: 25

on:
workflow_dispatch:

Expand Down Expand Up @@ -41,16 +45,16 @@ jobs:
- 5432:5432

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

- uses: actions/setup-node@v4
- uses: actions/setup-node@v6
with:
node-version: ${{ vars.NODE_VERSION }}
node-version: ${{ env.NODE_VERSION }}

- uses: actions/setup-java@v4
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: ${{ vars.JAVA_VERSION }}
java-version: ${{ env.JAVA_VERSION }}

- name: Install libs
run: |
Expand All @@ -67,7 +71,7 @@ jobs:
fc-list > font-list.txt

- name: Cache local Maven repository
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down Expand Up @@ -103,7 +107,7 @@ jobs:

- name: upload result artifacts
if: ${{ always() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: Generated Images and Logs
path: |
Expand Down
Loading