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

skal endre default branch name fra master til main #2503

Merged
merged 1 commit into from
Jan 9, 2024
Merged

skal endre default branch name fra master til main #2503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .github/tag.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env bash

#0: Sjekk at du er på master
#0: Sjekk at du er på main
current_branch=$(git branch | grep \* | cut -d ' ' -f2)
master_branch="master"
main_branch="main"

if ! [ "$current_branch" == "$master_branch" ]; then
printf "Må være på master-branch for å tagge. Avslutter script\n"
if ! [ "$current_branch" == "$main_branch" ]; then
printf "Må være på main-branch for å tagge. Avslutter script\n"
exit 1
fi

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build, push, and deploy app to dev and prod
on:
push:
branches:
- 'master'
- 'main'

env:
IMAGE: ghcr.io/navikt/familie-ef-sak:${{ github.sha }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ For å koble til preprod kan du kjøre kommandoene:
5. Passord: Lim inn det som ligger i clipboard fra steg 2

## Produksjonssetting
Applikasjonen vil deployes til produksjon ved ny commit på master-branchen. Det er dermed tilstrekkelig å merge PR for å trigge produksjonsbygget.
Applikasjonen vil deployes til produksjon ved ny commit på main-branchen. Det er dermed tilstrekkelig å merge PR for å trigge produksjonsbygget.

## Roller
Testbrukeren som opprettes i IDA må ha minst en av følgende roller:
Expand Down