diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 359a1fcf1..124b7a18b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,12 +1,12 @@ version: 2 updates: -- package-ecosystem: maven - directory: "/" - schedule: - interval: daily - time: "04:00" - open-pull-requests-limit: 10 - ignore: - - dependency-name: org.webjars:swagger-ui - versions: - - "> 3.25.2" + - package-ecosystem: "gradle" + directory: "/reposilite-backend" + schedule: + interval: "daily" + time: "16:15" + - package-ecosystem: "npm" + directory: "/reposilite-frontend" + schedule: + interval: "daily" + time: "16:15" diff --git a/.github/workflows/maven.yml b/.github/workflows/gradle.yml similarity index 68% rename from .github/workflows/maven.yml rename to .github/workflows/gradle.yml index b02824c55..3f123bb21 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/gradle.yml @@ -1,9 +1,11 @@ + name: Reposilite CI + on: push: - branches: [ master ] + branches: [ master, main, "3.0" ] pull_request: - branches: [ master ] + branches: [ master, main, "3.0" ] jobs: build: @@ -19,7 +21,9 @@ jobs: uses: actions/setup-java@v1 with: java-version: ${{ matrix.jdk }} - - name: Build with Maven - run: sudo mvn package --file pom.xml + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 diff --git a/.gitignore b/.gitignore index 77ccf4d0f..69f300aac 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ stats.dat maven-metadata.xml* ### Maven ### +build/ target/ pom.xml.tag pom.xml.releaseBackup diff --git a/.run/Reposilite.run.xml b/.run/Reposilite.run.xml index 49f40e910..38597ecba 100644 --- a/.run/Reposilite.run.xml +++ b/.run/Reposilite.run.xml @@ -1,21 +1,11 @@ - + - -