Skip to content

Commit

Permalink
Oppgrader avhengigheter og endre til maven
Browse files Browse the repository at this point in the history
  • Loading branch information
ugur93 committed Apr 12, 2024
1 parent 80300ba commit 7b88463
Show file tree
Hide file tree
Showing 26 changed files with 560 additions and 658 deletions.
33 changes: 28 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,40 @@
version: 2
registries:
maven-github:
type: maven-repository
url: https://github-package-registry-mirror.gc.nav.no/cached/maven-release
username: x-access-token
password: no-secret-required
updates:
- package-ecosystem: "gradle"
- package-ecosystem: "maven"
directory: "/"
registries:
- "maven-github"
ignore:
- dependency-name: "no.nav.bidrag:bidrag-commons"
versions: [ "0.x.x" ]
schedule:
interval: "daily"
open-pull-requests-limit: 15
interval: "weekly"
day: "monday"
time: "06:00"
timezone: "Europe/Oslo"
commit-message:
prefix: "[dependency] "
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "weekly"
open-pull-requests-limit: 15
day: "monday"
time: "06:00"
timezone: "Europe/Oslo"
commit-message:
prefix: "[docker] "
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
open-pull-requests-limit: 15
day: "monday"
time: "06:00"
timezone: "Europe/Oslo"
commit-message:
prefix: "[github-actions] "
98 changes: 0 additions & 98 deletions .github/workflows/deploy.yaml

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/deploy_feature.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Deploy feature
on:
workflow_dispatch:
push:
branches:
- '**'
- '!main'
- '!dependabot/**'

jobs:
build-deploy:
name: "Build and deploy to feature"
permissions:
contents: "read"
id-token: "write"
uses: navikt/bidrag-workflow/.github/workflows/deploy.yaml@github_server_2
secrets: inherit
with:
maven_options: -B -q -fae -Pit
17 changes: 17 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Deploy to dev
on:
workflow_dispatch:
pull_request:
types: [ ready_for_review, opened, synchronize ]

jobs:
build-deploy:
name: "Build and deploy to main"
permissions:
contents: "read"
id-token: "write"
uses: navikt/bidrag-workflow/.github/workflows/deploy.yaml@github_server_2
secrets: inherit
with:
nais_variabler_filnavn: main.yaml
maven_options: -B -q -fae -Pit
16 changes: 16 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Deploy to prod
on:
push:
branches:
- 'main'

jobs:
build-deploy:
name: "Build and deploy to prod"
permissions:
contents: "write"
id-token: "write"
uses: navikt/bidrag-workflow/.github/workflows/deploy_prod.yaml@github_server_2
secrets: inherit
with:
maven_options: -B -q -fae -Pit
19 changes: 19 additions & 0 deletions .github/workflows/rollback_prod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Rollback prod to previous version
on:
workflow_dispatch:
inputs:
deploy_tag:
description: 'Deploy tag. Default the previous tag will be deployed'
required: false

jobs:
build-deploy:
name: "Rollback and deploy previous version to prod"
permissions:
contents: "write"
id-token: "write"
uses: navikt/bidrag-workflow/.github/workflows/rollback_prod.yaml@github_server_2
secrets: inherit
with:
deploy_tag: ${{inputs.deploy_tag}}
maven_options: -B -q -fae -Pit
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ COPY --from=busybox /bin/sh /bin/sh
COPY --from=busybox /bin/printenv /bin/printenv

WORKDIR /app

COPY build/libs/app.jar app.jar
COPY ./target/bidrag-dokument-*.jar app.jar
COPY templates templates
COPY resources resources
COPY data data
Expand Down
143 changes: 0 additions & 143 deletions build.gradle.kts

This file was deleted.

1 change: 0 additions & 1 deletion gradle.properties

This file was deleted.

Binary file removed gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 0 additions & 7 deletions gradle/wrapper/gradle-wrapper.properties

This file was deleted.

Loading

0 comments on commit 7b88463

Please sign in to comment.