Skip to content

Commit

Permalink
Merge pull request #802 from Stirling-Tools/normalize_files
Browse files Browse the repository at this point in the history
refactor: normalize all files (strip trailing whitespace + convert CRLF to LF)
  • Loading branch information
sbplat authored Feb 11, 2024
2 parents 3dd0471 + 4f3b85e commit 6a487ce
Show file tree
Hide file tree
Showing 143 changed files with 17,468 additions and 17,470 deletions.
5 changes: 4 additions & 1 deletion .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Formatting
5f771b785130154ed47952635b7acef371ffe0ec
5f771b785130154ed47952635b7acef371ffe0ec

# Normalize files
55d4fda01b2f39f5b7d7b4fda5214bd7ff0fd5dd
22 changes: 11 additions & 11 deletions .github/workflows/push-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Push Docker Image with VersionNumber
on:
workflow_dispatch:
push:
branches:
branches:
- master
- main
permissions:
Expand All @@ -15,13 +15,13 @@ jobs:
steps:

- uses: actions/[email protected]

- name: Set up JDK 17
uses: actions/[email protected]
with:
java-version: '17'
distribution: 'temurin'


- uses: gradle/[email protected]
env:
Expand All @@ -32,11 +32,11 @@ jobs:

- name: Make Gradle wrapper executable
run: chmod +x gradlew

- name: Get version number
id: versionNumber
run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)"

- name: Login to Docker Hub
uses: docker/[email protected]
with:
Expand All @@ -53,7 +53,7 @@ jobs:
- name: Convert repository owner to lowercase
id: repoowner
run: echo "::set-output name=lowercase::$(echo ${{ github.repository_owner }} | awk '{print tolower($0)}')"

- name: Generate tags
id: meta
uses: docker/[email protected]
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
cache-to: type=gha,mode=max
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args:
build-args:
VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
platforms: linux/amd64,linux/arm64/v8

Expand All @@ -99,7 +99,7 @@ jobs:
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/[email protected]
Expand All @@ -112,7 +112,7 @@ jobs:
cache-to: type=gha,mode=max
tags: ${{ steps.meta2.outputs.tags }}
labels: ${{ steps.meta2.outputs.labels }}
build-args:
build-args:
VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
platforms: linux/amd64,linux/arm64/v8

Expand All @@ -129,7 +129,7 @@ jobs:
tags: |
type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-lite,enable=${{ github.ref == 'refs/heads/master' }}
type=raw,value=latest-lite,enable=${{ github.ref == 'refs/heads/master' }}
- name: Build and push Dockerfile-lite
uses: docker/[email protected]
Expand All @@ -142,7 +142,7 @@ jobs:
cache-to: type=gha,mode=max
tags: ${{ steps.meta3.outputs.tags }}
labels: ${{ steps.meta3.outputs.labels }}
build-args:
build-args:
VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
platforms: linux/amd64,linux/arm64/v8
- name: Build and Push Helm Chart
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/releaseArtifacts.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Release Artifacts

on:
release:
on:
release:
types: [created]
permissions:
contents: write
Expand All @@ -19,13 +19,13 @@ jobs:
file_suffix: ''
steps:
- uses: actions/[email protected]

- name: Set up JDK 17
uses: actions/[email protected]
with:
java-version: '17'
distribution: 'temurin'

- name: Grant execute permission for gradlew
run: chmod +x gradlew

Expand All @@ -42,11 +42,11 @@ jobs:
asset_name: Stirling-PDF${{ matrix.file_suffix }}.exe
tag: ${{ github.ref }}
overwrite: true

- name: Get version number
id: versionNumber
run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)"

- name: Upload jar binaries to release
uses: svenstaro/upload-release-action@v2
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Update Swagger
on:
workflow_dispatch:
push:
branches:
branches:
- master
jobs:
push:
Expand All @@ -12,13 +12,13 @@ jobs:
steps:

- uses: actions/[email protected]

- name: Set up JDK 17
uses: actions/[email protected]
with:
java-version: '17'
distribution: 'temurin'

- name: Grant execute permission for gradlew
run: chmod +x gradlew

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Run Docker Compose Tests
run: |
chmod +x ./gradlew
- name: Get version number
id: versionNumber
run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)"
Expand Down
Loading

0 comments on commit 6a487ce

Please sign in to comment.