Skip to content

Commit

Permalink
Merge branch 'main' into task/fjerne-avslag-minsteinntekt-sjekk
Browse files Browse the repository at this point in the history
  • Loading branch information
geiralund authored Apr 26, 2024
2 parents 076d352 + 3a887f6 commit 7d1c0f0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-auto-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v2.0.0
uses: dependabot/fetch-metadata@v2.1.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
distribution: temurin
java-version: 21

- uses: gradle/[email protected].0
- uses: gradle/[email protected].1
env:
ORG_GRADLE_PROJECT_githubUser: x-access-token
ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
with:
distribution: temurin
java-version: 21
- uses: gradle/[email protected].0
- uses: gradle/[email protected].0
- uses: gradle/[email protected].1
- uses: gradle/[email protected].1
env:
# Eksluder test dependencies
DEPENDENCY_GRAPH_INCLUDE_CONFIGURATIONS: compileClasspath|runtimeClasspath
Expand Down

0 comments on commit 7d1c0f0

Please sign in to comment.