Lagt til codeql, fjernet jitpack (#1707)

* Create codeql.yml * Fjernet jitpack, bytt navn på github_password i gradle
navikt · Oct 13, 2023 · 68b1d13 · 68b1d13
1 parent 3ce736c
commit 68b1d13
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/.github/workflows/build-master.yaml b/.github/workflows/build-master.yaml
@@ -39,12 +39,12 @@ jobs:
       - name: Run a build, generating the dependency graph snapshot which will be submitted
         run: ./gradlew build
         env:
-          GITHUB_PASSWORD: ${{ secrets.READER_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.READER_TOKEN }}
 
       - name: Kjør tester & bygg JAR
         run: ./gradlew test shadowjar
         env:
-          GITHUB_PASSWORD: ${{ secrets.READER_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.READER_TOKEN }}
 
       - uses: docker/login-action@v3
         with:

diff --git a/.github/workflows/build-pull-request.yaml b/.github/workflows/build-pull-request.yaml
@@ -28,5 +28,4 @@ jobs:
       - name: Kjør tester & bygg JAR
         run: ./gradlew clean test shadowjar
         env:
-          GITHUB_USERNAME: x-access-token
-          GITHUB_PASSWORD: ${{ secrets.READER_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.READER_TOKEN }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -0,0 +1,16 @@
+name: CodeQL
+on:
+  push: 
+    branches: [ master ]
+
+jobs:
+  codeql:
+    uses: navikt/sif-gha-workflows/.github/workflows/gradle-codeql.yml@main
+    permissions:
+      actions: read
+      contents: read
+      pull-requests: read
+      security-events: write
+    secrets: inherit
+    with:
+      readertoken: true
diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml
@@ -23,8 +23,7 @@ jobs:
       - name: Kjør tester & bygg JAR
         run: ./gradlew test shadowjar
         env:
-          GITHUB_USERNAME: x-access-token
-          GITHUB_PASSWORD: ${{ secrets.READER_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.READER_TOKEN }}
 
       - uses: docker/login-action@v3
         with:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -106,13 +106,11 @@ repositories {
         url = uri("https://maven.pkg.github.com/navikt/dusseldorf-ktor")
         credentials {
             username = project.findProperty("gpr.user") as String? ?: "x-access-token"
-            password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_PASSWORD")
+            password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
         }
     }
 
     mavenCentral()
-    maven("https://jitpack.io")
-
     mavenLocal()
 }