Skip to content

Commit 277e5e4

Browse files
committed
Final version of dockerhub.
1 parent 4cc921c commit 277e5e4

File tree

1 file changed

+7
-19
lines changed

1 file changed

+7
-19
lines changed

.github/workflows/docker-hub.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,10 @@ jobs:
5757
echo "PLATFORM_LIST=$PLATFORM_LIST" >> $GITHUB_ENV
5858
echo "::set-output name=platform_list::$PLATFORM_LIST"
5959
60-
test_matrix:
61-
name: Test Platform List
62-
runs-on: ubuntu-latest
63-
needs: generate_matrix
64-
steps:
65-
- name: Test platform list
66-
run: |
67-
set -exuo pipefail
68-
platforms=($(echo '${{ needs.generate_matrix.outputs.platform_list }}' | jq -r '.[]'))
69-
for platform in "${platforms[@]}"; do
70-
echo "$platform"
71-
done
72-
7360
build:
7461
name: Build
7562
runs-on: ubuntu-latest
76-
needs: test_matrix
63+
needs: generate_matrix
7764
strategy:
7865
fail-fast: false
7966
matrix:
@@ -106,9 +93,10 @@ jobs:
10693
run: |
10794
./docker-compose.sh platform
10895
109-
echo
110-
echo "-------------------- Run Tests --------------------"
111-
echo
96+
- name: Run Tests
97+
env:
98+
DOCKER_BUILDKIT: 1
99+
run: |
112100
set -exuo pipefail
113101
docker image inspect ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:cli --format='{{.Os}}/{{.Architecture}}'
114102
cat <<EOF > Dockerfile.test
@@ -152,7 +140,7 @@ jobs:
152140
- name: Create and Push Manifest Lists
153141
run: |
154142
tags=("deps" "dev" "runtime" "cli")
155-
platforms=("${{ join(fromJSON(needs.generate_matrix.outputs.platform_list), '" "') }}")
143+
platforms=($(echo '${{ needs.generate_matrix.outputs.platform_list }}' | jq -r '.[]'))
156144
157145
echo "Create all the tags by platform"
158146
@@ -203,7 +191,7 @@ jobs:
203191
- name: Remove Platform-Specific Tags
204192
run: |
205193
tags=("deps" "dev" "runtime" "cli")
206-
platforms=("${{ join(fromJSON(needs.generate_matrix.outputs.platform_list), '" "') }}")
194+
platforms=($(echo '${{ needs.generate_matrix.outputs.platform_list }}' | jq -r '.[]'))
207195
208196
for tag in "${tags[@]}"; do
209197
for platform in "${platforms[@]}"; do

0 commit comments

Comments
 (0)