8000 refactor!: using main branch instead of master · solidnerd/docker-bookstack@f826651 · GitHub
[go: up one dir, main page]
Skip to content

Commit f826651

Browse files
author
levi
committed
refactor!: using main branch instead of master
1 parent fe6e51f commit f826651

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

‎.github/workflows/master.yml renamed to ‎.github/workflows/main.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name: "master"
1+
name: "main"
22

33
on:
44
push:
55
branches:
6-
- master
6+
- main
77

88
jobs:
99
build:
@@ -29,12 +29,12 @@ jobs:
2929
tags: |
3030
${{ steps.docker_meta_ci.outputs.tags }}
3131
labels: ${{ steps.docker_meta_ci.outputs.labels }}
32-
cache-from: type=registry,ref=solidnerd/bookstack-dev:master
32+
cache-from: type=registry,ref=solidnerd/bookstack-dev:main
3333
outputs: type=docker,dest=/tmp/image-bookstack.tar
3434
- name: Upload artifact
3535
uses: actions/upload-artifact@v2
3636
with:
37-
name: image-bookstack-master
37+
name: image-bookstack-main
3838
path: /tmp/image-bookstack.tar
3939
if-no-files-found: warn
4040
e2e:
@@ -46,7 +46,7 @@ jobs:
4646
- name: Download artifact
4747
uses: actions/download-artifact@v2
4848
with:
49-
name: image-bookstack-master
49+
name: image-bookstack-main
5050
path: /tmp
5151
- name: Load Docker image
5252
run: |
@@ -70,7 +70,7 @@ jobs:
7070
- name: Download artifact
7171
uses: actions/download-artifact@v2
7272
with:
73-
name: image-bookstack-master
73+
name: image-bookstack-main
7474
path: /tmp
7575
if-no-files-found: warn
7676
- name: Load Docker image
@@ -88,7 +88,7 @@ jobs:
8888
username: ${{ secrets.DOCKER_USERNAME }}
8989
password: ${{ secrets.DOCKER_PASSWORD }}
9090
- name: Login to GitHub Container Registry
91-
uses: docker/login-action@v1
91+
uses: docker/login-action@v1
9292
with:
9393
registry: ghcr.io
9494
username: ${{ github.repository_owner }}

‎.github/workflows/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "PR"
33
on:
44
pull_request:
55
branches:
6-
- master
6+
- main
77

88
jobs:
99
build:
@@ -29,7 +29,7 @@ jobs:
2929
tags: |
3030
${{ steps.docker_meta_ci.outputs.tags }}
3131
labels: ${{ steps.docker_meta_ci.outputs.labels }}
32-
cache-from: type=registry,ref=solidnerd/bookstack-dev:master
32+
cache-from: type=registry,ref=solidnerd/bookstack-dev:main
3333
cache-to: type=inline
3434
outputs: type=docker,dest=/tmp/image-bookstack.tar
3535
- name: Upload artifact

‎.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929
tags: |
3030
${{ steps.docker_meta_ci.outputs.tags }}
3131
labels: ${{ steps.docker_meta_ci.outputs.labels }}
32-
cache-from: type=registry,ref=solidnerd/bookstack-dev:master
32+
cache-from: type=registry,ref=solidnerd/bookstack-dev:main
3333
outputs: type=docker,dest=/tmp/image-bookstack.tar
3434
- name: Upload artifact
3535
uses: actions/upload-artifact@v2
3636
with:
37-
name: image-bookstack-master
37+
name: image-bookstack-main
3838
path: /tmp/image-bookstack.tar
3939
e2e:
4040
runs-on: ubuntu-latest
@@ -45,7 +45,7 @@ jobs:
4545
- name: Download artifact
4646
uses: actions/download-artifact@v2
4747
with:
48-
name: image-bookstack-master
48+
name: image-bookstack-main
4949
path: /tmp
5050
- name: Load Docker image
5151
run: |
@@ -69,7 +69,7 @@ jobs:
6969
- name: Download artifact
7070
uses: actions/download-artifact@v2
7171
with:
72-
name: image-bookstack-master
72+
name: image-bookstack-main
7373
path: /tmp
7474
- name: Load Docker image
7575
run: |
@@ -86,12 +86,12 @@ jobs:
8686
username: ${{ secrets.DOCKER_USERNAME }}
8787
password: ${{ secrets.DOCKER_PASSWORD }}
8888
- name: Login to GitHub Container Registry
89-
uses: docker/login-action@v1
89+
uses: docker/login-action@v1
9090
with:
9191
registry: ghcr.io
9292
username: ${{ github.repository_owner }}
9393
password: ${{ secrets.CR_PAT }}
94-
- name: Build and Push master
94+
- name: Build and Push main
9595
uses: docker/build-push-action@v2
9696
with:
9797
context: .

0 commit comments

Comments
 (0)
0