Skip to content

Commit

Permalink
Retter java-versjon og la til permissions i workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Kroken committed Sep 4, 2023
1 parent d46a53b commit ff69b2b
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/deploy_dev_gcp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ jobs:
tag_build_and_deploy:
name: 'Build, deploy and tag'
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
# PULLER REPO
- name: 'Pull repo'
Expand Down Expand Up @@ -50,4 +53,4 @@ jobs:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
RESOURCE: nais/dev-gcp.yml
CLUSTER: dev-gcp
IMAGE: ${{ env.IMAGE_GHCR }}
IMAGE: ${{ env.IMAGE_GHCR }}
24 changes: 24 additions & 0 deletions .github/workflows/gradle-dependency-submission.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Monitor dependencies with Dependabot
on:
push:
branches:
- main
paths:
- "**.gradle.kts"
- "gradle.properties"
workflow_dispatch:
jobs:
dependabot:
name: Monitor dependencies with Dependabot
runs-on: ubuntu-20.04
permissions: # The Dependency Submission API requires write permission
contents: write
steps:
- uses: actions/checkout@v3 # ratchet:actions/checkout@v3
- name: Run snapshot action
uses: mikepenz/[email protected]
with:
fail-on-error: true
gradle-dependency-path: "build.gradle.kts"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8 changes: 7 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ apply(plugin = "io.spring.dependency-management")
group = "no.nav.pensjon.opptjening"
java.sourceCompatibility = JavaVersion.VERSION_17

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}

repositories {
mavenLocal()
mavenCentral()
Expand Down Expand Up @@ -84,4 +90,4 @@ tasks.withType<Test> {
TestLogEvent.SKIPPED
)
}
}
}

0 comments on commit ff69b2b

Please sign in to comment.