diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf688d534..5f04fc757 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,8 +48,8 @@ jobs: if: always() run: | declare -a dirs=( - "stirling-pdf/build/reports/tests/" - "stirling-pdf/build/test-results/" + "core/build/reports/tests/" + "core/build/test-results/" "common/build/reports/tests/" "common/build/test-results/" "proprietary/build/reports/tests/" @@ -74,9 +74,9 @@ jobs: with: name: test-reports-jdk-${{ matrix.jdk-version }}-spring-security-${{ matrix.spring-security }} path: | - stirling-pdf/build/reports/tests/ - stirling-pdf/build/test-results/ - stirling-pdf/build/reports/problems/ + core/build/reports/tests/ + core/build/test-results/ + core/build/reports/problems/ common/build/reports/tests/ common/build/test-results/ common/build/reports/problems/ @@ -87,6 +87,33 @@ jobs: retention-days: 3 if-no-files-found: warn + check-generateOpenApiDocs: + runs-on: ubuntu-latest + steps: + - name: Harden Runner + uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2 + with: + egress-policy: audit + + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + + - name: Set up JDK 17 + uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 + with: + java-version: "17" + distribution: "temurin" + + - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1 + + - name: Generate OpenAPI documentation + run: ./gradlew generateOpenApiDocs + + - name: Upload OpenAPI Documentation + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 + with: + name: openapi-docs + path: ./SwaggerDoc.json + check-licence: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/sync_files.yml b/.github/workflows/sync_files.yml index cf5ecbc5c..c5274a47c 100644 --- a/.github/workflows/sync_files.yml +++ b/.github/workflows/sync_files.yml @@ -8,8 +8,8 @@ on: paths: - "build.gradle" - "README.md" - - "stirling-pdf/src/main/resources/messages_*.properties" - - "stirling-pdf/src/main/resources/static/3rdPartyLicenses.json" + - "core/src/main/resources/messages_*.properties" + - "core/src/main/resources/static/3rdPartyLicenses.json" - "scripts/ignore_translation.toml" permissions: @@ -41,11 +41,11 @@ jobs: - name: Sync translation property files run: | - python .github/scripts/check_language_properties.py --reference-file "stirling-pdf/src/main/resources/messages_en_GB.properties" --branch main + python .github/scripts/check_language_properties.py --reference-file "core/src/main/resources/messages_en_GB.properties" --branch main - name: Commit translation files run: | - git add stirling-pdf/src/main/resources/messages_*.properties + git add core/src/main/resources/messages_*.properties git diff --staged --quiet || git commit -m ":memo: Sync translation files" || echo "No changes detected" - name: Install dependencies @@ -101,4 +101,4 @@ jobs: sign-commits: true add-paths: | README.md - stirling-pdf/src/main/resources/messages_*.properties + core/src/main/resources/messages_*.properties diff --git a/.gitignore b/.gitignore index ca949e769..7da46303e 100644 --- a/.gitignore +++ b/.gitignore @@ -125,7 +125,7 @@ SwaggerDoc.json *.rar *.db /build -/stirling-pdf/build +/core/build /common/build /proprietary/build diff --git a/.vscode/settings.json b/.vscode/settings.json index 3f272e18a..4d9ad0b48 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,12 +3,18 @@ "editor.guides.bracketPairs": "active", "editor.guides.bracketPairsHorizontal": "active", "cSpell.enabled": false, + "[feature]": { + "editor.defaultFormatter": "alexkrechik.cucumberautocomplete" + }, "[java]": { "editor.defaultFormatter": "josevseb.google-java-format-for-vs-code" }, "[jsonc]": { "editor.defaultFormatter": "vscode.json-language-features" }, + "[css]": { + "editor.defaultFormatter": "stylelint.vscode-stylelint" + }, "[json]": { "editor.defaultFormatter": "vscode.json-language-features" }, @@ -27,6 +33,9 @@ "[gradle]": { "editor.defaultFormatter": "vscjava.vscode-gradle" }, + "[yaml]": { + "editor.defaultFormatter": "redhat.vscode-yaml" + }, "java.compile.nullAnalysis.mode": "automatic", "java.configuration.updateBuildConfiguration": "interactive", "java.format.enabled": true, @@ -120,7 +129,7 @@ "html.format.preserveNewLines": true, "html.format.maxPreserveNewLines": 2, "java.project.sourcePaths": [ - "stirling-pdf/src/main/java", + "core/src/main/java", "common/src/main/java", "proprietary/src/main/java" ]