Skip to content

Commit 8ed871a

Browse files
Reorganise steps
1 parent 3adfadd commit 8ed871a

1 file changed

Lines changed: 27 additions & 19 deletions

File tree

.github/workflows/build-and-test.yml

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,45 +43,49 @@ jobs:
4343
if: "!contains(github.event.head_commit.message, '[skip ci]')"
4444

4545
steps:
46-
- uses: actions/checkout@v2
47-
with:
48-
submodules: recursive
49-
- run: |
46+
- name: Git Config
47+
shell: bash
48+
run: |
5049
git config --global core.autocrlf false
5150
git config --global core.longpaths true
51+
52+
- name: Git Checkout
53+
uses: actions/checkout@v2
54+
with:
55+
submodules: recursive
5256

5357
# See https://github.com/actions/checkout/issues/165#issuecomment-657673315
54-
- name: Create LFS file list
58+
- name: Git Create LFS FileList
5559
run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
5660

57-
- name: Restore LFS cache
61+
- name: Git Setup LFS Cache
5862
uses: actions/cache@v2
5963
id: lfs-cache
6064
with:
6165
path: .git/lfs
6266
key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}-v1
6367

64-
- name: Git LFS Pull
68+
- name: Git Pull LFS
6569
run: git lfs pull
6670

67-
- name: Install NuGet
71+
- name: NuGet Install
6872
uses: NuGet/setup-nuget@v1
6973

70-
- name: Setup NuGet Cache
74+
- name: NuGet Setup Cache
7175
uses: actions/cache@v2
7276
id: nuget-cache
7377
with:
7478
path: ~/.nuget
7579
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.props', '**/*.targets') }}
7680
restore-keys: ${{ runner.os }}-nuget-
7781

78-
- name: Build
82+
- name: DotNet Build
7983
shell: pwsh
8084
run: ./ci-build.ps1 "${{matrix.options.framework}}"
8185
env:
8286
SIXLABORS_TESTING: True
8387

84-
- name: Test
88+
- name: DotNet Test
8589
shell: pwsh
8690
run: ./ci-test.ps1 "${{matrix.options.os}}" "${{matrix.options.framework}}" "${{matrix.options.runtime}}" "${{matrix.options.codecov}}"
8791
env:
@@ -95,7 +99,7 @@ jobs:
9599
name: actual_output_${{ runner.os }}_${{ matrix.options.framework }}${{ matrix.options.runtime }}.zip
96100
path: tests/Images/ActualOutput/
97101

98-
- name: Update Codecov
102+
- name: Codecov Update
99103
uses: codecov/codecov-action@v1
100104
if: matrix.options.codecov == true && startsWith(github.repository, 'SixLabors')
101105
with:
@@ -109,21 +113,25 @@ jobs:
109113
if: (github.event_name == 'push')
110114

111115
steps:
112-
- uses: actions/checkout@v2
113-
with:
114-
submodules: recursive
115-
- run: |
116+
- name: Git Config
117+
shell: bash
118+
run: |
116119
git config --global core.autocrlf false
117120
git config --global core.longpaths true
118121
119-
- name: Install NuGet
122+
- name: Git Checkout
123+
uses: actions/checkout@v2
124+
with:
125+
submodules: recursive
126+
127+
- name: NuGet Install
120128
uses: NuGet/setup-nuget@v1
121129

122-
- name: Pack
130+
- name: DotNet Pack
123131
shell: pwsh
124132
run: ./ci-pack.ps1
125133

126-
- name: Publish to MyGet
134+
- name: MyGet Publish
127135
shell: pwsh
128136
run: |
129137
nuget.exe push .\artifacts\*.nupkg ${{secrets.MYGET_TOKEN}} -Source https://www.myget.org/F/sixlabors/api/v2/package

0 commit comments

Comments
 (0)