Skip to content

Commit 00bc06b

Browse files
author
Rick Henry
committed
Improve visual distinction of steps in workflows
1 parent dfd1266 commit 00bc06b

File tree

3 files changed

+44
-2
lines changed

3 files changed

+44
-2
lines changed

.github/workflows/master.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,17 @@ jobs:
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v3
14+
1415
- name: Set up CI Image Metadata
1516
id: docker_meta_ci
1617
uses: crazy-max/ghaction-docker-meta@v1
1718
with:
1819
images: solidnerd/bookstack-dev
1920
tag-sha: true
21+
2022
- name: Set up Docker Buildx
2123
uses: docker/setup-buildx-action@v2
24+
2225
- name: Build Image
2326
uses: docker/build-push-action@v3
2427
with:
@@ -31,33 +34,39 @@ jobs:
3134
labels: ${{ steps.docker_meta_ci.outputs.labels }}
3235
cache-from: type=registry,ref=solidnerd/bookstack-dev:master
3336
outputs: type=docker,dest=/tmp/image-bookstack.tar
37+
3438
- name: Upload artifact
3539
uses: actions/upload-artifact@v3
3640
with:
3741
name: image-bookstack-master
3842
path: /tmp/image-bookstack.tar
3943
if-no-files-found: warn
44+
4045
e2e:
4146
runs-on: ubuntu-latest
4247
needs: build
4348
steps:
4449
- name: Checkout
4550
uses: actions/checkout@v3
51+
4652
- name: Download artifact
4753
uses: actions/download-artifact@v3
4854
with:
4955
name: image-bookstack-master
5056
path: /tmp
57+
5158
- name: Load Docker image
5259
run: |
5360
docker load --input /tmp/image-bookstack.tar
5461
docker image ls -a
62+
5563
push:
5664
runs-on: ubuntu-20.04
5765
needs: e2e
5866
steps:
5967
- name: Checkout
6068
uses: actions/checkout@v3
69+
6170
- name: Set up Docker Hub Image Metadata
6271
id: docker_meta
6372
uses: crazy-max/ghaction-docker-meta@v1
@@ -67,6 +76,7 @@ jobs:
6776
{{version}}
6877
{{major}}.{{minor}}
6978
{{major}}.{{minor}}.{{patch}}
79+
7080
- name: Download artifact
7181
uses: actions/download-artifact@v3
7282
with:
@@ -77,22 +87,27 @@ jobs:
7787
run: |
7888
docker load --input /tmp/image-bookstack.tar
7989
docker image ls -a
90+
8091
- name: Set up QEMU
8192
uses: docker/setup-qemu-action@v2
93+
8294
- name: Set up Docker Buildx
8395
uses: docker/setup-buildx-action@v2
96+
8497
- name: Login to DockerHub
8598
if: github.event_name != 'pull_request'
8699
uses: docker/login-action@v2
87100
with:
88101
username: ${{ secrets.DOCKER_USERNAME }}
89102
password: ${{ secrets.DOCKER_PASSWORD }}
103+
90104
- name: Login to GitHub Container Registry
91-
uses: docker/login-action@v2
105+
uses: docker/login-action@v2
92106
with:
93107
registry: ghcr.io
94108
username: ${{ github.repository_owner }}
95109
password: ${{ secrets.CR_PAT }}
110+
96111
- name: Build and Push
97112
uses: docker/build-push-action@v3
98113
with:

.github/workflows/pr.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,17 @@ jobs:
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v3
14+
1415
- name: Docker meta ci
1516
id: docker_meta_ci
1617
uses: crazy-max/ghaction-docker-meta@v1
1718
with:
1819
images: solidnerd/bookstack-dev
1920
tag-sha: true
21+
2022
- name: Set up Docker Buildx
2123
uses: docker/setup-buildx-action@v2
24+
2225
- name: Build and push Dev
2326
uses: docker/build-push-action@v3
2427
with:
@@ -32,27 +35,32 @@ jobs:
3235
cache-from: type=registry,ref=solidnerd/bookstack-dev:master
3336
cache-to: type=inline
3437
outputs: type=docker,dest=/tmp/image-bookstack.tar
38+
3539
- name: Upload artifact
3640
uses: actions/upload-artifact@v3
3741
with:
3842
name: image-bookstack
3943
path: /tmp/image-bookstack.tar
4044
if-no-files-found: warn
45+
4146
e2e:
4247
runs-on: ubuntu-latest
4348
needs: build
4449
steps:
4550
- name: Checkout
4651
uses: actions/checkout@v3
52+
4753
- name: Download artifact
4854
uses: actions/download-artifact@v3
4955
with:
5056
name: image-bookstack
5157
path: /tmp
5258
if-no-files-found: warn
59+
5360
- name: Load Docker image
5461
run: |
5562
docker load --input /tmp/image-bookstack.tar
5663
docker image ls -a
64+
5765
- name: Execute End-to-End Test
5866
run: make e2e

.github/workflows/release.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,17 @@ jobs:
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v3
14+
1415
- name: Set up CI Image Metadata
1516
id: docker_meta_ci
1617
uses: crazy-max/ghaction-docker-meta@v1
1718
with:
1819
images: solidnerd/bookstack-dev
1920
tag-sha: true
21+
2022
- name: Set up Docker Buildx
2123
uses: docker/setup-buildx-action@v2
24+
2225
- name: Build and push Dev
2326
uses: docker/build-push-action@v3
2427
with:
@@ -31,32 +34,38 @@ jobs:
3134
labels: ${{ steps.docker_meta_ci.outputs.labels }}
3235
cache-from: type=registry,ref=solidnerd/bookstack-dev:master
3336
outputs: type=docker,dest=/tmp/image-bookstack.tar
37+
3438
- name: Upload artifact
3539
uses: actions/upload-artifact@v3
3640
with:
3741
name: image-bookstack-master
3842
path: /tmp/image-bookstack.tar
43+
3944
e2e:
4045
runs-on: ubuntu-latest
4146
needs: build
4247
steps:
4348
- name: Checkout
4449
uses: actions/checkout@v3
50+
4551
- name: Download artifact
4652
uses: actions/download-artifact@v3
4753
with:
4854
name: image-bookstack-master
4955
path: /tmp
56+
5057
- name: Load Docker image
5158
run: |
5259
docker load --input /tmp/image-bookstack.tar
5360
docker image ls -a
61+
5462
push:
5563
runs-on: ubuntu-20.04
5664
needs: e2e
5765
steps:
5866
- name: Checkout
5967
uses: actions/checkout@v3
68+
6069
- name: Set up Docker Hub Image Metadata
6170
id: docker_meta
6271
uses: crazy-max/ghaction-docker-meta@v1
@@ -66,31 +75,38 @@ jobs:
6675
{{version}}
6776
{{major}}.{{minor}}
6877
{{major}}.{{minor}}.{{patch}}
78+
6979
- name: Download artifact
7080
uses: actions/download-artifact@v3
7181
with:
7282
name: image-bookstack-master
7383
path: /tmp
84+
7485
- name: Load Docker image
7586
run: |
7687
docker load --input /tmp/image-bookstack.tar
7788
docker image ls -a
89+
7890
- name: Set up QEMU
7991
uses: docker/setup-qemu-action@v2
92+
8093
- name: Set up Docker Buildx
8194
uses: docker/setup-buildx-action@v2
95+
8296
- name: Login to DockerHub
8397
if: github.event_name != 'pull_request'
8498
uses: docker/login-action@v2
8599
with:
86100
username: ${{ secrets.DOCKER_USERNAME }}
87101
password: ${{ secrets.DOCKER_PASSWORD }}
102+
88103
- name: Login to GitHub Container Registry
89-
uses: docker/login-action@v2
104+
uses: docker/login-action@v2
90105
with:
91106
registry: ghcr.io
92107
username: ${{ github.repository_owner }}
93108
password: ${{ secrets.CR_PAT }}
109+
94110
- name: Build and Push master
95111
uses: docker/build-push-action@v3
96112
with:
@@ -103,18 +119,21 @@ jobs:
103119
labels: ${{ steps.docker_meta.outputs.labels }}
104120
cache-from: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
105121
cache-to: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
122+
106123
create-release:
107124
runs-on: ubuntu-20.04
108125
needs: push
109126
steps:
110127
# To use this repository's private action, you must check out the repository
111128
- name: Checkout
112129
uses: actions/checkout@v3
130+
113131
- name: Generate changelog
114132
id: changelog
115133
uses: metcalfc/changelog-generator@v3.0.0
116134
with:
117135
myToken: ${{ secrets.GITHUB_TOKEN }}
136+
118137
- name: Create Release
119138
id: create_release
120139
uses: actions/create-release@v1.1.4

0 commit comments

Comments
 (0)