updating the build files (#1100)

This commit is contained in:
Ludy 2024-04-21 17:30:17 +02:00 committed by GitHub
parent a5000fbbc5
commit 5185fd13b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 201 additions and 203 deletions

View File

@ -2,12 +2,12 @@ name: "Build repo"
on: on:
push: push:
branches: [ "main" ] branches: ["main"]
paths-ignore: paths-ignore:
- ".github/**" - ".github/**"
- "**/*.md" - "**/*.md"
pull_request: pull_request:
branches: [ "main" ] branches: ["main"]
paths-ignore: paths-ignore:
- ".github/**" - ".github/**"
- "**/*.md" - "**/*.md"
@ -25,16 +25,18 @@ jobs:
fail-fast: false fail-fast: false
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: "17"
distribution: 'temurin' distribution: "temurin"
- uses: gradle/gradle-build-action@v2.4.2 - uses: gradle/actions/setup-gradle@v3
with: with:
gradle-version: 7.6 gradle-version: 7.6
arguments: build --no-build-cache
- name: Build with Gradle
run: ./gradlew build --no-build-cache

View File

@ -5,7 +5,7 @@ on:
branches: branches:
- main - main
paths: paths:
- 'build.gradle' - "build.gradle"
permissions: permissions:
contents: write contents: write
@ -17,13 +17,15 @@ jobs:
steps: steps:
- name: Check out code - name: Check out code
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v3 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: "17"
distribution: 'adopt' distribution: "adopt"
- uses: gradle/actions/setup-gradle@v3
- name: Run Gradle Command - name: Run Gradle Command
run: ./gradlew clean generateLicenseReport run: ./gradlew clean generateLicenseReport
@ -44,7 +46,7 @@ jobs:
- name: Create Pull Request - name: Create Pull Request
if: env.CHANGES_DETECTED == 'true' if: env.CHANGES_DETECTED == 'true'
uses: peter-evans/create-pull-request@v3 uses: peter-evans/create-pull-request@v6
with: with:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
commit-message: "Update 3rd Party Licenses" commit-message: "Update 3rd Party Licenses"
@ -58,4 +60,3 @@ jobs:
[1]: https://github.com/peter-evans/create-pull-request [1]: https://github.com/peter-evans/create-pull-request
draft: false draft: false
delete-branch: true delete-branch: true

View File

@ -14,105 +14,99 @@ jobs:
push: push:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3.5.2 - name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: "17"
distribution: "temurin"
- name: Set up JDK 17 - uses: gradle/actions/setup-gradle@v3
uses: actions/setup-java@v3.11.0 with:
with: gradle-version: 7.6
java-version: '17'
distribution: 'temurin'
- name: Run Gradle Command
run: ./gradlew clean build
env:
DOCKER_ENABLE_SECURITY: false
- uses: gradle/gradle-build-action@v2.4.2 - name: Set up Docker Buildx
env: id: buildx
DOCKER_ENABLE_SECURITY: false uses: docker/setup-buildx-action@v3
with:
gradle-version: 7.6
arguments: clean build
- name: Make Gradle wrapper executable - name: Get version number
run: chmod +x gradlew id: versionNumber
run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
- name: Get version number - name: Login to Docker Hub
id: versionNumber uses: docker/login-action@v3
run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)" with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_API }}
- name: Login to Docker Hub - name: Login to GitHub Container Registry
uses: docker/login-action@v2.1.0 uses: docker/login-action@v3
with: with:
username: ${{ secrets.DOCKER_HUB_USERNAME }} registry: ghcr.io
password: ${{ secrets.DOCKER_HUB_API }} username: ${{ github.actor }}
password: ${{ github.token }}
- name: Login to GitHub Container Registry - name: Set up QEMU
uses: docker/login-action@v2.1.0 uses: docker/setup-qemu-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ github.token }}
- name: Convert repository owner to lowercase - name: Convert repository owner to lowercase
id: repoowner id: repoowner
run: echo "::set-output name=lowercase::$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')" run: echo "lowercase=$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')" >> $GITHUB_OUTPUT
- name: Generate tags - name: Generate tags
id: meta id: meta
uses: docker/metadata-action@v4.4.0 uses: docker/metadata-action@v5
with: with:
images: | images: |
${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
tags: | tags: |
type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{ github.ref == 'refs/heads/master' }} type=raw,value=${{ steps.versionNumber.outputs.versionNumber }},enable=${{ github.ref == 'refs/heads/master' }}
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }} type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }} type=raw,value=alpha,enable=${{ github.ref == 'refs/heads/main' }}
- name: Set up QEMU - name: Build and push main Dockerfile
uses: docker/setup-qemu-action@v2.1.0 uses: docker/build-push-action@v5
with:
builder: ${{ steps.buildx.outputs.name }}
context: .
file: ./Dockerfile
push: true
cache-from: type=gha
cache-to: type=gha,mode=max
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
platforms: linux/amd64,linux/arm64/v8
- name: Set up Docker Buildx - name: Generate tags ultra-lite
uses: docker/setup-buildx-action@v2.5.0 id: meta2
uses: docker/metadata-action@v5
if: github.ref != 'refs/heads/main'
with:
images: |
${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
tags: |
type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
- name: Build and push main Dockerfile - name: Build and push Dockerfile-ultra-lite
uses: docker/build-push-action@v4.0.0 uses: docker/build-push-action@v5
with: if: github.ref != 'refs/heads/main'
context: . with:
dockerfile: ./Dockerfile context: .
push: true file: ./Dockerfile-ultra-lite
cache-from: type=gha push: true
cache-to: type=gha,mode=max cache-from: type=gha
tags: ${{ steps.meta.outputs.tags }} cache-to: type=gha,mode=max
labels: ${{ steps.meta.outputs.labels }} tags: ${{ steps.meta2.outputs.tags }}
build-args: labels: ${{ steps.meta2.outputs.labels }}
VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }} build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
platforms: linux/amd64,linux/arm64/v8 platforms: linux/amd64,linux/arm64/v8
- name: Generate tags ultra-lite
id: meta2
uses: docker/metadata-action@v4.4.0
if: github.ref != 'refs/heads/main'
with:
images: |
${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
tags: |
type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
type=raw,value=latest-ultra-lite,enable=${{ github.ref == 'refs/heads/master' }}
- name: Build and push Dockerfile-ultra-lite
uses: docker/build-push-action@v4.0.0
if: github.ref != 'refs/heads/main'
with:
context: .
file: ./Dockerfile-ultra-lite
push: true
cache-from: type=gha
cache-to: type=gha,mode=max
tags: ${{ steps.meta2.outputs.tags }}
labels: ${{ steps.meta2.outputs.labels }}
build-args:
VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
platforms: linux/amd64,linux/arm64/v8

View File

@ -1,6 +1,7 @@
name: Release Artifacts name: Release Artifacts
on: on:
workflow_dispatch:
release: release:
types: [created] types: [created]
permissions: permissions:
@ -14,44 +15,61 @@ jobs:
enable_security: [true, false] enable_security: [true, false]
include: include:
- enable_security: true - enable_security: true
file_suffix: '-with-login' file_suffix: "-with-login"
- enable_security: false - enable_security: false
file_suffix: '' file_suffix: ""
steps: steps:
- uses: actions/checkout@v3.5.2 - uses: actions/checkout@v4
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v3.11.0 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: "17"
distribution: 'temurin' distribution: "temurin"
- name: Grant execute permission for gradlew - uses: gradle/actions/setup-gradle@v3
run: chmod +x gradlew with:
gradle-version: 7.6
- name: Generate jar (With Security=${{ matrix.enable_security }}) - name: Generate jar (With Security=${{ matrix.enable_security }})
run: ./gradlew clean createExe run: ./gradlew clean createExe
env: env:
DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }} DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}
- name: Upload binaries to release - name: Get version number
uses: svenstaro/upload-release-action@v2 id: versionNumber
with: run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ./build/launch4j/Stirling-PDF.exe
asset_name: Stirling-PDF${{ matrix.file_suffix }}.exe
tag: ${{ github.ref }}
overwrite: true
- name: Get version number - name: Rename binarie
id: versionNumber if: matrix.file_suffix != ''
run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)" run: cp ./build/launch4j/Stirling-PDF.exe ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe
- name: Upload jar binaries to release - name: Upload Assets binarie
uses: svenstaro/upload-release-action@v2 uses: actions/upload-artifact@v4
with: with:
repo_token: ${{ secrets.GITHUB_TOKEN }} path: ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe
file: ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar name: Stirling-PDF${{ matrix.file_suffix }}.exe
asset_name: Stirling-PDF${{ matrix.file_suffix }}.jar overwrite: true
tag: ${{ github.ref }} retention-days: 1
overwrite: true if-no-files-found: error
- name: Upload binaries to release
uses: softprops/action-gh-release@v2
with:
files: ./build/launch4j/Stirling-PDF${{ matrix.file_suffix }}.exe
- name: Rename jar binaries
run: cp ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
- name: Upload Assets jar binaries
uses: actions/upload-artifact@v4
with:
path: ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
name: Stirling-PDF${{ matrix.file_suffix }}.jar
overwrite: true
retention-days: 1
if-no-files-found: error
- name: Upload jar binaries to release
uses: softprops/action-gh-release@v2
with:
files: ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar

View File

@ -8,31 +8,32 @@ on:
jobs: jobs:
push: push:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3.5.2 - name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: "17"
distribution: "temurin"
- name: Set up JDK 17 - uses: gradle/actions/setup-gradle@v3
uses: actions/setup-java@v3.11.0
with:
java-version: '17'
distribution: 'temurin'
- name: Grant execute permission for gradlew - name: Generate Swagger documentation
run: chmod +x gradlew run: ./gradlew generateOpenApiDocs
- name: Generate Swagger documentation - name: Upload Swagger Documentation to SwaggerHub
run: ./gradlew generateOpenApiDocs run: ./gradlew swaggerhubUpload
env:
SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}
- name: Upload Swagger Documentation to SwaggerHub - name: Get version number
run: ./gradlew swaggerhubUpload id: versionNumber
env: run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}
- name: Set API version as published and default on SwaggerHub - name: Set API version as published and default on SwaggerHub
run: | run: |
curl -X PUT -H "Authorization: ${SWAGGERHUB_API_KEY}" "https://api.swaggerhub.com/apis/Frooodle/Stirling-PDF/${{ steps.versionNumber.outputs.versionNumber }}/settings/lifecycle" -H "accept: application/json" -H "Content-Type: application/json" -d "{\"published\":true,\"default\":true}" curl -X PUT -H "Authorization: ${SWAGGERHUB_API_KEY}" "https://api.swaggerhub.com/apis/Frooodle/Stirling-PDF/${{ steps.versionNumber.outputs.versionNumber }}/settings/lifecycle" -H "accept: application/json" -H "Content-Type: application/json" -d "{\"published\":true,\"default\":true}"
env: env:
SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }} SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}

View File

@ -3,54 +3,36 @@ name: Docker Compose Tests
on: on:
pull_request: pull_request:
paths: paths:
- 'src/**' - "src/**"
- '**.gradle' - "**.gradle"
- '!src/main/java/resources/messages*' - "!src/main/java/resources/messages*"
- 'exampleYmlFiles/**' - "exampleYmlFiles/**"
- 'Dockerfile' - "Dockerfile"
- 'Dockerfile**' - "Dockerfile**"
jobs: jobs:
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@v2 uses: actions/checkout@v4
- name: Set up Java 17 - name: Set up Java 17
uses: actions/setup-java@v2 uses: actions/setup-java@v4
with: with:
java-version: '17' java-version: "17"
distribution: 'adopt' distribution: "adopt"
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1 uses: docker/setup-buildx-action@v3
- name: Run Docker Compose Tests - name: Install Docker Compose
run: | run: |
chmod +x ./gradlew sudo curl -SL "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
# sudo chmod +x /usr/local/bin/docker-compose
- name: Get version number - name: Run Docker Compose Tests
id: versionNumber run: |
run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)" chmod +x ./test.sh
./test.sh
- name: Cache Docker layers
uses: actions/cache@v2
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ steps.versionNumber.outputs.versionNumber }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Install Docker Compose
run: |
sudo curl -L "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
- name: Run Docker Compose Tests
run: |
chmod +x ./test.sh
./test.sh