diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml index 39128a7..5630fe3 100644 --- a/.gitea/workflows/server.yaml +++ b/.gitea/workflows/server.yaml @@ -2,10 +2,21 @@ name: Build, Package and Push Images run-name: ${{ gitea.actor }} is building the Server application on: push: + branches: + - develop + - master paths-ignore: - Wiki/** - Benchmarks/** - .run/** + pull_request: + types: + - ready_for_review + - edited + paths-ignore: + - Wiki/** + - Benchmarks/** + - .run/** jobs: preprocess: @@ -30,7 +41,6 @@ jobs: - name: Build run: | dotnet build Continuity.AuthServer -c Release - # dotnet test Server.Tests -c Release sonarqube: needs: build @@ -91,7 +101,7 @@ jobs: serverHostname: ${{ secrets.DEPENDENCY_TRACK_URL }} projectName: ${{ secrets.DEPENDENCY_TRACK_PROJECT_NAME }} autoCreate: true - # set projectversion to be the branch name + # set projectversion to be the branch name projectVersion: ${{ github.ref_name }} bomFilename: ${{ github.workspace }}/bom.xml diff --git a/renovate.json b/renovate.json index d4af3f3..83c23ff 100644 --- a/renovate.json +++ b/renovate.json @@ -8,5 +8,6 @@ "enabled": true, "labels": ["security"] }, - "extends": [":gitSignOff",":labels(dependencies)", "docker:disable", "docker:pinDigests"] + "extends": [":gitSignOff",":labels(dependencies)", "docker:disable", "docker:pinDigests"], + "baseBranches": ["master", "/^release\\/.*/", "develop"] }