Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
geirolz committed Aug 8, 2022
2 parents 08b67c9 + c0291ee commit 25e59e4
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 9 deletions.
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
8 changes: 4 additions & 4 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
test-tasks: test # scoverage doesn’t support Scala 3

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

#----------- JDK -----------
- name: Set up JDK 11
Expand All @@ -46,7 +46,7 @@ jobs:

#----------- CACHE -----------
- name: Cache SBT
uses: actions/cache@v2.1.4
uses: actions/cache@v3.0.6
with:
# A list of files, directories, and wildcard patterns to cache and restore
path: |
Expand All @@ -68,7 +68,7 @@ jobs:
needs: [build]
if: github.event_name != 'pull_request'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

#----------- JDK -----------
- name: Set up JDK 11
Expand All @@ -78,7 +78,7 @@ jobs:

#----------- CACHE -----------
- name: Cache SBT
uses: actions/cache@v2.1.4
uses: actions/cache@v3.0.6
with:
# A list of files, directories, and wildcard patterns to cache and restore
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
steps:
# Checkout the repository to the GitHub Actions runner
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3

# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
- name: Run Codacy Analysis CLI
Expand All @@ -55,6 +55,6 @@ jobs:

# Upload the SARIF file generated in the previous step
- name: Upload SARIF results file
uses: github/codeql-action/upload-sarif@v1
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: results.sarif
18 changes: 15 additions & 3 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pull_request_rules:
- label!=work-in-progress
actions:
merge:
method: merge
method: rebase
priority: high
- name: automatic merge for master when CI passes and author is steward
conditions:
Expand All @@ -22,5 +22,17 @@ pull_request_rules:
- base=main
actions:
merge:
method: merge
priority: medium
method: rebase
priority: medium
- name: automatic merge for master when CI passes and author is dependabot
conditions:
- author=dependabot[bot]
- check-success=codecov/patch
- check-success=codecov/project
- check-success=build (Scala2)
- check-success=build (Scala3)
- base=main
actions:
merge:
method: rebase
priority: medium

0 comments on commit 25e59e4

Please sign in to comment.