Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lagt til codeql, fjernet jitpack #1707

Merged
merged 2 commits into from
Oct 13, 2023
Merged

Lagt til codeql, fjernet jitpack #1707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5eb485
Create codeql.yml
albrektsson Oct 13, 2023
660dae9
Fjernet jitpack, bytt navn på github_password i gradle
albrektsson Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/build-pull-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
16 changes: 16 additions & 0 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 1 addition & 2 deletions .github/workflows/deploy-preprod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 1 addition & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand Down