Skip to content

Commit

Permalink
Merge branch 'develop' into feature/uvf
Browse files Browse the repository at this point in the history
  • Loading branch information
overheadhunter committed May 16, 2024
2 parents 8320786 + 0a04162 commit 458e98a
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 43 deletions.
31 changes: 31 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
version: 2
updates:
- package-ecosystem: "maven"
directory: "/backend"
schedule:
interval: "monthly"
groups:
maven-build-plugins:
patterns:
- "org.apache.maven.plugins:*"
- "me.fabriciorby:maven-surefire-junit5-tree-reporter"
java-production-dependencies:
patterns:
- "*"
exclude-patterns:
- "org.apache.maven.plugins:*"
- "me.fabriciorby:maven-surefire-junit5-tree-reporter"
ignore:
- dependency-name: "io.quarkus:*"
update-types: ["version-update:semver-major", "version-update:semver-minor"]

- package-ecosystem: "github-actions"
directory: "/" # even for `.github/workflows`
schedule:
interval: "monthly"
groups:
github-actions:
patterns:
- "*"
labels:
- "ci"
9 changes: 4 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ jobs:
test:
name: Build and Test
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')" # can the if also be est for all jobs?
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: 'npm'
Expand Down Expand Up @@ -55,13 +54,13 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
- uses: actions/setup-java@v2
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ env.JAVA_VERSION }}
cache: 'maven'
- name: Cache SonarCloud packages
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/closeJira.yml

This file was deleted.

12 changes: 6 additions & 6 deletions .github/workflows/keycloak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
name: Build Custom Keycloak Image
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: 'npm'
Expand All @@ -32,17 +32,17 @@ jobs:
working-directory: keycloak/themes/cryptomator/common/resources
run: npm run build
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to GHCR
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and Push Container Image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: keycloak
platforms: linux/amd64,linux/arm64/v8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Tag image in github registry
run: docker tag ghcr.io/cryptomator/hub@${{ github.event.inputs.digest}} ghcr.io/cryptomator/hub:${{ github.event.inputs.tag }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down
4 changes: 2 additions & 2 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<quarkus.platform.version>3.8.2</quarkus.platform.version>
<quarkus.jib.base-jvm-image>eclipse-temurin:21-jre</quarkus.jib.base-jvm-image> <!-- irrelevant for -Pnative -->
<jwt.version>4.4.0</jwt.version>
<compiler-plugin.version>3.12.1</compiler-plugin.version>
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<dependency-plugin.version>3.6.1</dependency-plugin.version>
<surefire-plugin.version>3.2.3</surefire-plugin.version>
<surefire-plugin.version>3.2.5</surefire-plugin.version>
<failsafe-plugin.version>3.2.5</failsafe-plugin.version>
<junit-tree-reporter.version>1.2.1</junit-tree-reporter.version>
</properties>
Expand Down

0 comments on commit 458e98a

Please sign in to comment.