Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit 46b88f8

Browse files
jactor-risesjactor-rises
authored
Merge pull request #26 from navikt/feature/main
master -> main
2 parents 0af8096 + 066309a commit 46b88f8

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

‎.github/workflows/test-commit.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: git commit workflow
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66

77
jobs:
88
test:
@@ -21,14 +21,14 @@ jobs:
2121
restore-keys: |
2222
${{ runner.os }}-maven-
2323
- run: mvn -B -e release:update-versions
24-
- uses: navikt/bidrag-git/commit@master
24+
- uses: navikt/bidrag-git/commit@main
2525
with:
2626
commit_message: bump version without author information
2727
pattern: pom.xml
2828
env:
2929
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3030
- run: mvn -B -e versions:set -DnewVersion=0.0.1-SNAPSHOT
31-
- uses: navikt/bidrag-git/commit@master
31+
- uses: navikt/bidrag-git/commit@main
3232
with:
3333
author: tester
3434
commit_message: reset version with author information given

‎.github/workflows/test-cucumber-backend.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: test-cucumber-backend
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66

77
jobs:
88
it:
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v2
14-
- uses: navikt/bidrag-maven/cucumber-backend@master
14+
- uses: navikt/bidrag-maven/cucumber-backend@main
1515
with:
1616
do_not_fail: true
1717
maven_command: test

‎.github/workflows/test-cucumber-clone.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ name: test cucumber-clone action
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66

77
jobs:
88
test:
99
runs-on: ubuntu-16.04
1010
name: test cucumber-clone action
1111

1212
steps:
13-
- uses: navikt/bidrag-integration/cucumber-clone@master
13+
- uses: navikt/bidrag-integration/cucumber-clone@main
1414
- name: verify cloned resources
1515
run: |
1616
set -x
@@ -22,7 +22,7 @@ jobs:
2222
ls -al "$CLONED_FOLDER"
2323
ls -al "$CLONED_FOLDER/simple"
2424
[ -d "$CLONED_FOLDER/simple/bidrag-test-github-actions" ] || exit 1
25-
- uses: navikt/bidrag-integration/cucumber-clone@master
25+
- uses: navikt/bidrag-integration/cucumber-clone@main
2626
with:
2727
folder_nais_apps: alternativ
2828
- name: verify cloned resources with alternative folder

‎.github/workflows/test-cucumber-pages.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: cucumber report
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66

77
jobs:
88
report-page:
@@ -15,7 +15,7 @@ jobs:
1515
run: echo $(jq '.[].elements[].steps[].result.status' src/test/resources/cucumber.json | grep -c passed || true) > passed
1616
- name: failed
1717
run: echo $(jq '.[].elements[].steps[].result.status' src/test/resources/cucumber.json | grep -c failed || true) > failed
18-
- uses: navikt/bidrag-integration/cucumber-move@master
18+
- uses: navikt/bidrag-integration/cucumber-move@main
1919
with:
2020
folder_move_from: resources/generated-report
2121
front_page: front-page.md
@@ -41,7 +41,7 @@ jobs:
4141
echo "Folder : $FOLDER"
4242
echo ::set-output name=folder::$FOLDER
4343
id: json
44-
- uses: navikt/bidrag-integration/cucumber-latest@master
44+
- uses: navikt/bidrag-integration/cucumber-latest@main
4545
id: report
4646
with:
4747
relative_filepath: docs/latest/cucumber.json
@@ -62,7 +62,7 @@ jobs:
6262
if [[ $FAILED -ne $(cat failed) ]]; then
6363
exit 1;
6464
fi
65-
- uses: navikt/bidrag-integration/cucumber-status@master
65+
- uses: navikt/bidrag-integration/cucumber-status@main
6666
id: status
6767
with:
6868
github_page: front-page.md
@@ -71,7 +71,7 @@ jobs:
7171
timestamp: ${{ steps.report.outputs.time_moved }}
7272
project_name: bidrag-test-github-actions
7373
ghp_folder: docs
74-
- uses: navikt/bidrag-integration/reports@master
74+
- uses: navikt/bidrag-integration/reports@main
7575
with:
7676
pages_address: https://navikt.github.io/bidrag-test-github-actions
7777
path_github_page: ${{ steps.status.outputs.path_edited_page }}

‎.github/workflows/test-docker.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: docker workflow
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66

77
env:
88
IMAGE: docker.pkg.github.com/${{ github.repository }}/bidrag-test-gh-actions:${{ github.sha }}
@@ -21,7 +21,7 @@ jobs:
2121
----
2222
$REQUEST
2323
"
24-
- uses: navikt/bidrag-docker/exists@master
24+
- uses: navikt/bidrag-docker/exists@main
2525
id: dockerimage
2626
with:
2727
image_name: bidrag-test-gh-actions
@@ -42,7 +42,7 @@ jobs:
4242
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4343
- run: mvn install -B -e -DskipTests=true
4444
- run: pwd && ls -al && cat Dockerfile
45-
- uses: navikt/bidrag-docker/build@master
45+
- uses: navikt/bidrag-docker/build@main
4646
env:
4747
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4848

@@ -60,7 +60,7 @@ jobs:
6060
----
6161
$REQUEST
6262
"
63-
- uses: navikt/bidrag-docker/exists@master
63+
- uses: navikt/bidrag-docker/exists@main
6464
id: dockerimage
6565
with:
6666
image_name: bidrag-test-gh-actions

‎.github/workflows/test-local-docker.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: test local docker image
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66

77
env:
88
IMAGE: docker.pkg.github.com/${{ github.repository }}/bidrag-test-gh-actions:${{ github.sha }}
@@ -18,7 +18,7 @@ jobs:
1818
IS_FOUND="true"
1919
docker image inspect $IMAGE || IS_FOUND="false"
2020
echo docker image is found: $IS_FOUND
21-
- uses: navikt/bidrag-docker/local-exists@master
21+
- uses: navikt/bidrag-docker/local-exists@main
2222
id: dockerimage
2323
with:
2424
image_id: ${{ env.IMAGE }}
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@v2
3434
- run: docker run --rm -v $PWD:/usr/src/mymaven -v ~/.m2:/root/.m2 -w /usr/src/mymaven maven:3.6.3-jdk-14 mvn install -B -e -DskipTests=true
3535
- run: pwd && ls -al && cat Dockerfile
36-
- uses: navikt/bidrag-docker/build@master
36+
- uses: navikt/bidrag-docker/build@main
3737
env:
3838
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3939

@@ -48,7 +48,7 @@ jobs:
4848
IS_FOUND="true"
4949
docker image inspect $IMAGE || IS_FOUND="false"
5050
echo docker image is found: $IS_FOUND
51-
- uses: navikt/bidrag-docker/local-exists@master
51+
- uses: navikt/bidrag-docker/local-exists@main
5252
id: dockerimage
5353
with:
5454
image_id: ${{ env.IMAGE }}

0 commit comments

Comments
 (0)