Skip to content

Commit

Permalink
GitActions clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
Finevman committed Jul 14, 2023
1 parent 7a02d2e commit 5b00749
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 14 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

- uses: actions/setup-java@v3
with:
java-version: "18"
java-version: "18.0.x"
architecture: x64
distribution: 'temurin'
cache: 'maven'
Expand All @@ -39,9 +39,7 @@ jobs:
run: |
ARCHIVE_NAME="privacydashboard-${{ steps.tagName.outputs.tag }}"
ARCHIVE_FILE="${ARCHIVE_NAME}.zip"
zip -r ${ARCHIVE_FILE} . -i ./target/classes/*
zip -r ${ARCHIVE_FILE} . -i ./target/flow-frontend/*
zip -r ${ARCHIVE_FILE} . -i ./target/*.jar
- name: Create a release
uses: softprops/action-gh-release@v1
Expand Down
17 changes: 7 additions & 10 deletions .github/workflows/github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,14 @@ jobs:

runs-on: ubuntu-latest

continue-on-error: true

strategy:
matrix:
java-version: [
'8',
'11',
'16',
'17',
'18',
'8.0.x',
'11.0.x',
'16.0.x',
'17.0.x',
'18.0.x',
]

steps:
Expand All @@ -46,13 +44,12 @@ jobs:

- name: Deploy Jacoco code coverage reports to gh-pages
uses: JamesIves/github-pages-deploy-action@v4
if: ${{ matrix.java-version == '18' }}
if: ${{ matrix.java-version == '18.0.x' }}
with:
clean: true
folder: target/site/jacoco
target-folder: reports
branch: gh-pages


# Build files necessary for building Docker Images (Dockerfiles and Contexts)
build-for-docker:
Expand All @@ -65,7 +62,7 @@ jobs:

- uses: actions/setup-java@v3
with:
java-version: "18"
java-version: "18.0.x"
architecture: x64
distribution: 'temurin'
cache: 'maven'
Expand Down

0 comments on commit 5b00749

Please sign in to comment.