diff --git a/.github/workflows/dependabot-auto-merge.yaml b/.github/workflows/dependabot-auto-merge.yaml deleted file mode 100644 index 4b4418ce..00000000 --- a/.github/workflows/dependabot-auto-merge.yaml +++ /dev/null @@ -1,26 +0,0 @@ -name: Dependabot auto-merge -on: pull_request - -permissions: - contents: write - pull-requests: write - -jobs: - dependabot: - runs-on: ubuntu-latest - if: github.event.pull_request.user.login == 'dependabot[bot]' - steps: - - name: Dependabot metadata - id: metadata - uses: dependabot/fetch-metadata@v2.4.0 - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" - - name: Enable auto-merge for Dependabot PRs - if: | - steps.metadata.outputs.update-type != 'version-update:semver-major' || - steps.metadata.outputs.package-ecosystem == 'github_actions' || - steps.metadata.outputs.dependency-names == 'no.nav.dagpenger:dp-version-catalog' - run: gh pr merge --auto --squash "$PR_URL" - env: - PR_URL: ${{github.event.pull_request.html_url}} - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/dependabot-build.yaml b/.github/workflows/dependabot-build.yaml index 3ab643be..699a1b03 100644 --- a/.github/workflows/dependabot-build.yaml +++ b/.github/workflows/dependabot-build.yaml @@ -6,7 +6,6 @@ on: - 'dependabot/**' jobs: - # Denne matches mot required checks som trigger automerge av Dependabot PRs. Endrer du her må du også endre i https://github.com/navikt/dp-auth/settings/branches test: name: test runs-on: ubuntu-latest @@ -17,6 +16,6 @@ jobs: distribution: temurin java-version: 21 - - uses: gradle/gradle-build-action@v3.5.0 - with: - arguments: --configuration-cache test + - uses: gradle/actions/wrapper-validation@v4 + - uses: gradle/actions/setup-gradle@v4 + - run: ./gradlew --configuration-cache test