Skip to content

Commit aeb28ff

Browse files
authored
DEV: Minor cleanup of the workflow (#914)
1 parent fa85268 commit aeb28ff

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ jobs:
2727
echo "timestamp=$timestamp" >> $GITHUB_OUTPUT
2828
2929
base:
30-
# `unbuntu-22.04-8core` for arch amd64 non-scheduled builds
31-
# `unbuntu-22.04` for arch amd64 scheduled builds
32-
# `unbuntu-22.04-8core-arm` for arch arm64 non-scheduled builds
33-
# `unbuntu-22.04-2core-arm` for arch arm64 scheduled builds
30+
# `ubuntu-22.04-8core` for arch amd64 non-scheduled builds
31+
# `ubuntu-22.04` for arch amd64 scheduled builds
32+
# `ubuntu-22.04-8core-arm` for arch arm64 non-scheduled builds
33+
# `ubuntu-22.04-2core-arm` for arch arm64 scheduled builds
3434
runs-on: ubuntu-22.04${{ ((github.event_name != 'schedule') && '-8core') || (( matrix.arch == 'arm64' && '-2core' ) || '') }}${{ (matrix.arch == 'arm64') && '-arm' || '' }}
3535
strategy:
3636
matrix:
@@ -45,7 +45,7 @@ jobs:
4545
ports:
4646
- 5000:5000
4747
steps:
48-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@v4
4949
with:
5050
fetch-depth: 1
5151

@@ -114,7 +114,7 @@ jobs:
114114
docker tag discourse/base:2.0.${{ env.TIMESTAMP }}-main-${{ matrix.arch }} localhost:5000/base:2.0.${{ env.TIMESTAMP }}-main-${{ matrix.arch }}
115115
docker push --quiet localhost:5000/base:2.0.${{ env.TIMESTAMP }}-slim-${{ matrix.arch }}
116116
docker push --quiet localhost:5000/base:2.0.${{ env.TIMESTAMP }}-main-${{ matrix.arch }}
117-
# multiarch manifest is an array of schemas - [0] is amd64, [1] is arch64: Compare amd64.
117+
# multi-arch manifest is an array of schemas - [0] is amd64, [1] is arch64: Compare amd64.
118118
CURRENT_SLIM=$(docker manifest inspect -v discourse/base:slim | jq -r '.[0].SchemaV2Manifest.layers[] | .size / 1024 / 1024 | .*100 | round/100' | awk '{print $0; sum+= $0}; END {print sum}' | tail -n 1)
119119
CURRENT_RELEASE=$(docker manifest inspect -v discourse/base:release | jq -r '.[0].SchemaV2Manifest.layers[] | .size / 1024 / 1024 | .*100 | round/100' | awk '{print $0; sum+= $0}; END {print sum}' | tail -n 1)
120120
NEW_SLIM=$(docker manifest inspect -v --insecure localhost:5000/base:2.0.${{ env.TIMESTAMP }}-slim-${{ matrix.arch }} | jq -r '.SchemaV2Manifest.layers[] | .size / 1024 / 1024 | .*100 | round/100' | awk '{print $0; sum+= $0}; END {print sum}' | tail -n 1)
@@ -138,14 +138,14 @@ jobs:
138138
docker tag discourse/base:2.0.${{ env.TIMESTAMP }}-main-${{ matrix.arch }} discourse/base:aarch64
139139
docker push discourse/base:aarch64
140140
141-
push_multiarch_manifests:
141+
push_multi_arch_manifests:
142142
runs-on: ubuntu-latest
143143
needs: [base, timestamp]
144144
env:
145145
TIMESTAMP: ${{ needs.timestamp.outputs.timestamp }}
146146
if: github.ref == 'refs/heads/main'
147147
steps:
148-
- name: create and push multiarch manifests
148+
- name: create and push multi-arch manifests
149149
run: |
150150
docker login --username discoursebuild --password ${{ secrets.DOCKERHUB_PASSWORD }}
151151
@@ -205,7 +205,7 @@ jobs:
205205
run:
206206
working-directory: image/discourse_test
207207
steps:
208-
- uses: actions/checkout@v3
208+
- uses: actions/checkout@v4
209209
with:
210210
fetch-depth: 1
211211
- name: build discourse_test:slim

0 commit comments

Comments
 (0)