arsvendg/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/arsvendg/Stirling-PDF.git synced 2026-07-16 19:33:11 +02:00
Code Issues Actions 4 Packages Projects Releases 1 Wiki Activity

fix merge issues

Browse Source
This commit is contained in:
Anthony Stirling
2025-08-11 10:22:47 +01:00
parent af69256abb
commit 17d9993a53
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
-18
View File
@@ -52,11 +52,7 @@ jobs:
spring-security: [true, false] spring-security: [true, false]
steps: steps:
- name: Harden Runner - name: Harden Runner
<<<<<<< HEAD
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0 uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
=======
uses: step-security/[email protected]
>>>>>>> refs/remotes/origin/V2
with: with:
egress-policy: audit egress-policy: audit
- name: Checkout repository - name: Checkout repository
@@ -110,11 +106,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Harden Runner - name: Harden Runner
<<<<<<< HEAD
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
=======
uses: step-security/[email protected] uses: step-security/[email protected]
>>>>>>> refs/remotes/origin/V2
with: with:
egress-policy: audit egress-policy: audit
- uses: actions/[email protected] - uses: actions/[email protected]
@@ -126,10 +118,7 @@ jobs:
- uses: gradle/actions/[email protected] - uses: gradle/actions/[email protected]
- name: Generate OpenAPI documentation - name: Generate OpenAPI documentation
run: ./gradlew :stirling-pdf:generateOpenApiDocs run: ./gradlew :stirling-pdf:generateOpenApiDocs
<<<<<<< HEAD
=======
>>>>>>> refs/remotes/origin/V2
- name: Upload OpenAPI Documentation - name: Upload OpenAPI Documentation
uses: actions/[email protected] uses: actions/[email protected]
with: with:
@@ -170,11 +159,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Harden Runner - name: Harden Runner
<<<<<<< HEAD
uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0 uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
=======
uses: step-security/[email protected]
>>>>>>> refs/remotes/origin/V2
with: with:
egress-policy: audit egress-policy: audit
- name: Checkout repository - name: Checkout repository
@@ -253,7 +238,6 @@ jobs:
chmod +x ./testing/test.sh chmod +x ./testing/test.sh
chmod +x ./testing/test_disabledEndpoints.sh chmod +x ./testing/test_disabledEndpoints.sh
./testing/test.sh ./testing/test.sh
<<<<<<< HEAD
test-build-docker-images: test-build-docker-images:
if: github.event_name == 'pull_request' && needs.files-changed.outputs.project == 'true' if: github.event_name == 'pull_request' && needs.files-changed.outputs.project == 'true'
@@ -320,5 +304,3 @@ jobs:
build/reports/problems/ build/reports/problems/
retention-days: 3 retention-days: 3
if-no-files-found: warn if-no-files-found: warn
=======
>>>>>>> refs/remotes/origin/V2