Skip to content

Commit

Permalink
Merge pull request #749 from RakambdaOrg/develop
Browse files Browse the repository at this point in the history
2.2.12
  • Loading branch information
Rakambda authored Apr 10, 2024
2 parents 517e023 + 94426ac commit 02cd15a
Show file tree
Hide file tree
Showing 21 changed files with 161 additions and 155 deletions.
14 changes: 7 additions & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ updates:
assignees:
- "Rakambda"
schedule:
interval: "daily"
interval: "weekly"
time: "05:00"
timezone: "Europe/Paris"
pull-request-branch-name:
Expand All @@ -29,7 +29,7 @@ updates:
# assignees:
# - "Rakambda"
# schedule:
# interval: "daily"
# interval: "weekly"
# time: "05:00"
# timezone: "Europe/Paris"
# pull-request-branch-name:
Expand All @@ -39,7 +39,7 @@ updates:
assignees:
- "Rakambda"
schedule:
interval: "daily"
interval: "weekly"
time: "05:00"
timezone: "Europe/Paris"
pull-request-branch-name:
Expand All @@ -51,7 +51,7 @@ updates:
assignees:
- "Rakambda"
schedule:
interval: "daily"
interval: "weekly"
time: "05:00"
timezone: "Europe/Paris"
pull-request-branch-name:
Expand All @@ -61,7 +61,7 @@ updates:
assignees:
- "Rakambda"
schedule:
interval: "daily"
interval: "weekly"
time: "05:00"
timezone: "Europe/Paris"
pull-request-branch-name:
Expand All @@ -71,7 +71,7 @@ updates:
assignees:
- "Rakambda"
schedule:
interval: "daily"
interval: "weekly"
time: "05:00"
timezone: "Europe/Paris"
pull-request-branch-name:
Expand All @@ -81,7 +81,7 @@ updates:
assignees:
- "Rakambda"
schedule:
interval: "daily"
interval: "weekly"
time: "05:00"
timezone: "Europe/Paris"
pull-request-branch-name:
Expand Down
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
".github/workflows/auto-approve-sync-files.yml"
],
"timezone": "Europe/Paris",
"schedule": ["before 5am"]
"schedule": ["on saturday"]
}
2 changes: 0 additions & 2 deletions .github/workflows/auto-aprove-sync-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@ on:
jobs:
auto-approve-synced-files:
uses: RakambdaOrg/rakambda-github-workflows/.github/workflows/approve-sync-files.yml@main
with:
runs-on: self-hosted
secrets:
sync-token: ${{ secrets.SYNC_TOKEN }}
89 changes: 52 additions & 37 deletions .github/workflows/build-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@ on:
workflow_dispatch:

jobs:
dependency-submission:
name: Dependencies submission
runs-on: ubuntu-latest
steps:
- name: Checkout source
uses: actions/checkout@v4
- name: Generate and submit dependency graph
uses: gradle/actions/[email protected]
continue-on-error: true

build:
name: Build project
runs-on: ubuntu-latest
Expand All @@ -27,12 +37,13 @@ jobs:
distribution: 'temurin'
java-version: ${{ vars.JAVA_VERSION }}

- name: Setup Gradle
uses: gradle/actions/[email protected]
- name: Build project
uses: gradle/gradle-build-action@v2
with:
arguments: |
assemble
--scan
run: |
./gradlew \
assemble \
--scan
- name: Upload miner jar file
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -67,26 +78,27 @@ jobs:
with:
distribution: 'temurin'
java-version: ${{ vars.JAVA_VERSION }}
- name: Setup Gradle
uses: gradle/actions/[email protected]

- name: Run tests
uses: gradle/gradle-build-action@v2
with:
arguments: |
:miner:test
--scan
run: |
./gradlew \
:miner:test \
--scan
- name: Generate JaCoCo report
uses: gradle/gradle-build-action@v2
if: always()
with:
arguments: :miner:jacocoTestReport
run: |
./gradlew \
:miner:jacocoTestReport
- name: Publish Test Report
uses: mikepenz/action-junit-report@v4
if: always()
with:
report_paths: 'miner/build/test-results/test/*.xml'
- name: Publish coverage on CodeCov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4.2.0
if: always()
with:
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down Expand Up @@ -130,26 +142,27 @@ jobs:
with:
distribution: 'temurin'
java-version: ${{ vars.JAVA_VERSION }}
- name: Setup Gradle
uses: gradle/actions/[email protected]

- name: Run tests
uses: gradle/gradle-build-action@v2
with:
arguments: |
:viewer:test
--scan
run: |
./gradlew \
:viewer:test \
--scan
- name: Generate JaCoCo report
uses: gradle/gradle-build-action@v2
if: always()
with:
arguments: :viewer:jacocoTestReport
run: |
./gradlew \
:viewer:jacocoTestReport
- name: Publish Test Report
uses: mikepenz/action-junit-report@v4
if: always()
with:
report_paths: 'viewer/build/test-results/test/*.xml'
- name: Publish coverage on CodeCov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4.2.0
if: always()
with:
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down Expand Up @@ -193,18 +206,19 @@ jobs:
with:
distribution: 'temurin'
java-version: ${{ vars.JAVA_VERSION }}
- name: Setup Gradle
uses: gradle/actions/[email protected]

- name: Calculate miner image name
id: miner-image-name
run: echo "IMAGE_NAME=${{ vars.DOCKER_IMAGE_MINER }}:${GITHUB_REF##*/}" >> "$GITHUB_OUTPUT"
- name: Push branch/tag on Docker Hub
uses: gradle/gradle-build-action@v2
with:
arguments: |
:miner:jib
-Djib.to.auth.username=${{ secrets.DOCKER_USERNAME }}
-Djib.to.auth.password=${{ secrets.DOCKER_TOKEN }}
-Djib.to.image=${{ steps.miner-image-name.outputs.IMAGE_NAME }}
run: |
./gradlew \
:miner:jib \
-Djib.to.auth.username=${{ secrets.DOCKER_USERNAME }} \
-Djib.to.auth.password=${{ secrets.DOCKER_TOKEN }} \
-Djib.to.image=${{ steps.miner-image-name.outputs.IMAGE_NAME }}
publish-viewer:
name: Publish Viewer on DockerHub
Expand All @@ -222,15 +236,16 @@ jobs:
with:
distribution: 'temurin'
java-version: ${{ vars.JAVA_VERSION }}
- name: Setup Gradle
uses: gradle/actions/[email protected]

- name: Calculate viewer image name
id: viewer-image-name
run: echo "IMAGE_NAME=${{ vars.DOCKER_IMAGE_VIEWER }}:${GITHUB_REF##*/}" >> "$GITHUB_OUTPUT"
- name: Push branch/tag on Docker Hub
uses: gradle/gradle-build-action@v2
with:
arguments: |
:viewer:jib
-Djib.to.auth.username=${{ secrets.DOCKER_USERNAME }}
-Djib.to.auth.password=${{ secrets.DOCKER_TOKEN }}
-Djib.to.image=${{ steps.viewer-image-name.outputs.IMAGE_NAME }}
run: |
./gradlew \
:viewer:jib \
-Djib.to.auth.username=${{ secrets.DOCKER_USERNAME }} \
-Djib.to.auth.password=${{ secrets.DOCKER_TOKEN }} \
-Djib.to.image=${{ steps.viewer-image-name.outputs.IMAGE_NAME }}
56 changes: 28 additions & 28 deletions .github/workflows/manual-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,29 @@ jobs:
with:
distribution: 'temurin'
java-version: ${{ vars.JAVA_VERSION }}
- name: Setup Gradle
uses: gradle/actions/[email protected]

- name: Calculate miner image name
id: miner-image-name
run: |
echo "IMAGE_NAME=${{ vars.DOCKER_IMAGE_MINER }}:${GITHUB_REF##*/}" >> "$GITHUB_OUTPUT"
echo "IMAGE_NAME_LATEST=${{ vars.DOCKER_IMAGE_MINER }}:latest" >> "$GITHUB_OUTPUT"
- name: Push branch/tag on Docker Hub
uses: gradle/gradle-build-action@v2
with:
arguments: |
:miner:jib
-Djib.to.auth.username=${{ secrets.DOCKER_USERNAME }}
-Djib.to.auth.password=${{ secrets.DOCKER_TOKEN }}
-Djib.to.image=${{ steps.miner-image-name.outputs.IMAGE_NAME }}
run: |
./gradlew \
:miner:jib \
-Djib.to.auth.username=${{ secrets.DOCKER_USERNAME }} \
-Djib.to.auth.password=${{ secrets.DOCKER_TOKEN }} \
-Djib.to.image=${{ steps.miner-image-name.outputs.IMAGE_NAME }}
- name: Push latest on Docker Hub
if: success() && github.ref == 'refs/heads/main'
uses: gradle/gradle-build-action@v2
with:
arguments: |
:miner:jib
-Djib.to.auth.username=${{ secrets.DOCKER_USERNAME }}
-Djib.to.auth.password=${{ secrets.DOCKER_TOKEN }}
-Djib.to.image=${{ steps.miner-image-name.outputs.IMAGE_NAME_LATEST }}
run: |
./gradlew \
:miner:jib \
-Djib.to.auth.username=${{ secrets.DOCKER_USERNAME }} \
-Djib.to.auth.password=${{ secrets.DOCKER_TOKEN }} \
-Djib.to.image=${{ steps.miner-image-name.outputs.IMAGE_NAME_LATEST }}
publish-viewer:
name: Publish Viewer on DockerHub
Expand All @@ -52,26 +52,26 @@ jobs:
with:
distribution: 'temurin'
java-version: ${{ env.APP_JAVA_VERSION }}
- name: Setup Gradle
uses: gradle/actions/[email protected]

- name: Calculate viewer image name
id: viewer-image-name
run: |
echo "IMAGE_NAME=${{ vars.DOCKER_IMAGE_VIEWER }}:${GITHUB_REF##*/}" >> "$GITHUB_OUTPUT"
echo "IMAGE_NAME_LATEST=${{ vars.DOCKER_IMAGE_VIEWER }}:latest" >> "$GITHUB_OUTPUT"
- name: Push branch/tag on Docker Hub
uses: gradle/gradle-build-action@v2
with:
arguments: |
:viewer:jib
-Djib.to.auth.username=${{ secrets.DOCKER_USERNAME }}
-Djib.to.auth.password=${{ secrets.DOCKER_TOKEN }}
-Djib.to.image=${{ steps.viewer-image-name.outputs.IMAGE_NAME }}
run: |
./gradlew \
:viewer:jib \
-Djib.to.auth.username=${{ secrets.DOCKER_USERNAME }} \
-Djib.to.auth.password=${{ secrets.DOCKER_TOKEN }} \
-Djib.to.image=${{ steps.viewer-image-name.outputs.IMAGE_NAME }}
- name: Push latest on Docker Hub
if: success() && github.ref == 'refs/heads/main'
uses: gradle/gradle-build-action@v2
with:
arguments: |
:viewer:jib
-Djib.to.auth.username=${{ secrets.DOCKER_USERNAME }}
-Djib.to.auth.password=${{ secrets.DOCKER_TOKEN }}
-Djib.to.image=${{ steps.viewer-image-name.outputs.IMAGE_NAME_LATEST }}
run: |
./gradlew \
:viewer:jib \
-Djib.to.auth.username=${{ secrets.DOCKER_USERNAME }} \
-Djib.to.auth.password=${{ secrets.DOCKER_TOKEN }} \
-Djib.to.image=${{ steps.viewer-image-name.outputs.IMAGE_NAME_LATEST }}
2 changes: 1 addition & 1 deletion .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v4
uses: actions/configure-pages@v5
- name: Install Node.js
uses: actions/setup-node@v4
with:
Expand Down
Loading

0 comments on commit 02cd15a

Please sign in to comment.