fix: ci merge test
This commit is contained in:
+13
-7
@@ -72,8 +72,14 @@ jobs:
|
|||||||
else
|
else
|
||||||
matrix="$matrix,"
|
matrix="$matrix,"
|
||||||
fi
|
fi
|
||||||
matrix="$matrix{\"name\":\"$svc\",\"dockerfile\":\"$df\",\"build\":\"$build\"}"
|
# use yes/no to avoid true/false being coerced to boolean in matrix if
|
||||||
echo "$svc=$build"
|
if [ "$build" = true ]; then
|
||||||
|
flag=yes
|
||||||
|
else
|
||||||
|
flag=no
|
||||||
|
fi
|
||||||
|
matrix="$matrix{\"name\":\"$svc\",\"dockerfile\":\"$df\",\"build\":\"$flag\"}"
|
||||||
|
echo "$svc=$flag"
|
||||||
done
|
done
|
||||||
matrix="$matrix]"
|
matrix="$matrix]"
|
||||||
|
|
||||||
@@ -92,25 +98,25 @@ jobs:
|
|||||||
NAME: lone/${{ matrix.name }}
|
NAME: lone/${{ matrix.name }}
|
||||||
steps:
|
steps:
|
||||||
- name: Skip
|
- name: Skip
|
||||||
if: matrix.build != 'true'
|
if: matrix.build != 'yes'
|
||||||
run: echo "skip ${{ matrix.name }} (no changes)"
|
run: echo "skip ${{ matrix.name }} (no changes)"
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
if: matrix.build == 'true'
|
if: matrix.build == 'yes'
|
||||||
uses: https://git.ailuowan.com/deploy/checkout@v4
|
uses: https://git.ailuowan.com/deploy/checkout@v4
|
||||||
|
|
||||||
- name: Login Registry
|
- name: Login Registry
|
||||||
if: matrix.build == 'true'
|
if: matrix.build == 'yes'
|
||||||
run: |
|
run: |
|
||||||
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ vars.REGISTRY }} -u "${{ vars.REGISTRY_USERNAME }}" --password-stdin
|
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ vars.REGISTRY }} -u "${{ vars.REGISTRY_USERNAME }}" --password-stdin
|
||||||
|
|
||||||
- name: Docker build
|
- name: Docker build
|
||||||
if: matrix.build == 'true'
|
if: matrix.build == 'yes'
|
||||||
run: |
|
run: |
|
||||||
docker buildx use default
|
docker buildx use default
|
||||||
docker buildx build --builder default --load -f "${{ matrix.dockerfile }}" -t "${{ vars.REGISTRY }}/$NAME:latest" .
|
docker buildx build --builder default --load -f "${{ matrix.dockerfile }}" -t "${{ vars.REGISTRY }}/$NAME:latest" .
|
||||||
|
|
||||||
- name: Docker push
|
- name: Docker push
|
||||||
if: matrix.build == 'true'
|
if: matrix.build == 'yes'
|
||||||
run: |
|
run: |
|
||||||
docker push ${{ vars.REGISTRY }}/$NAME:latest
|
docker push ${{ vars.REGISTRY }}/$NAME:latest
|
||||||
|
|||||||
Reference in New Issue
Block a user