Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feature/isDisasterRec…
Browse files Browse the repository at this point in the history
…over

# Conflicts:
#	src/Nox.Cli.Server/Nox.Cli.Server.csproj
  • Loading branch information
jan-schutte committed Feb 23, 2024
2 parents 9fb792a + f7f7d32 commit 8c8e36f
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version: 2
updates:
- package-ecosystem: nuget
directory: /src
schedule:
interval: daily
time: "08:00"
groups:
deps:
patterns:
- "*"
ignore:
- dependency-name: "*"
update-types:
- version-update:semver-major
7 changes: 6 additions & 1 deletion .github/workflows/nox_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ on:
- tests/**
- .github/workflows/nox_ci.yaml

permissions:
id-token: write
contents: read
checks: write

jobs:
build:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -42,4 +47,4 @@ jobs:
name: Tests Results
path: "**/test-results.trx"
reporter: dotnet-trx
fail-on-error: true
fail-on-error: true
Empty file modified src/Nox.Cli/Nox.Cli.csproj
100755 → 100644
Empty file.

0 comments on commit 8c8e36f

Please sign in to comment.