Skip to content

Commit cbac321

Browse files
committed
endra master til main
1 parent a349bce commit cbac321

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.github/workflows/build-image.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
env:
120120
SERVICE_SECRET: ${{ secrets.SERVICE_SECRET }}
121121
- name: Upload static files to Nav CDN
122-
uses: nais/deploy/actions/cdn-upload/v2@master
122+
uses: nais/deploy/actions/cdn-upload/v2@main
123123
with:
124124
team: personbruker
125125
source: ./.next/static

.github/workflows/deploy-alerts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Deploy prod-alerts
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66
paths:
77
- .nais/alerts.yml
88

.github/workflows/deploy-storybook.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Deploy Storybook to github pages
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77

88
permissions:
99
contents: read

.github/workflows/deploy.prod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
build:
8-
if: github.event.release.target_commitish == 'master'
8+
if: github.event.release.target_commitish == 'main'
99
uses: ./.github/workflows/build-image.yml
1010
permissions:
1111
contents: "read"

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ Se også https://cloud.google.com/artifact-registry/docs/docker/authentication#g
4848

4949
## Prodsetting
5050

51-
- Lag en PR til master, og merge inn etter godkjenning
52-
- Lag en release på master med versjon-bump, beskrivende tittel og oppsummering av endringene dine
51+
- Lag en PR til main, og merge inn etter godkjenning
52+
- Lag en release på main med versjon-bump, beskrivende tittel og oppsummering av endringene dine
5353
- Publiser release'en for å starte deploy til prod
5454

5555
## Logger og metrikker

0 commit comments

Comments
 (0)