Merge remote-tracking branch 'origin/release-v43' into release-v44

This commit is contained in:
Zaiming (Stone) Shi 2022-11-07 15:24:26 +01:00
commit 7b2c4998aa
3 changed files with 10 additions and 1 deletions

View File

@ -35,6 +35,9 @@ jobs:
container: ghcr.io/emqx/emqx-builder/4.4-20:${{ matrix.otp }}-${{ matrix.os }} container: ghcr.io/emqx/emqx-builder/4.4-20:${{ matrix.otp }}-${{ matrix.os }}
steps: steps:
- uses: AutoModality/action-clean@v1
# keep using v1 for now as the otp-23 image has an old version git
# TODO: change to v3 after OTP is upgraded to 23.3.4.18-1
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: fix-git-unsafe-repository - name: fix-git-unsafe-repository
run: git config --global --add safe.directory /__w/emqx/emqx run: git config --global --add safe.directory /__w/emqx/emqx

View File

@ -150,6 +150,7 @@ jobs:
run: | run: |
docker rm -f $(docker ps -qa) || true docker rm -f $(docker ps -qa) || true
docker network rm $(docker network ls -q) || true docker network rm $(docker network ls -q) || true
docker system prune --volumes -f
- name: docker compose up - name: docker compose up
working-directory: source working-directory: source
env: env:
@ -221,6 +222,11 @@ jobs:
- name: set log file name - name: set log file name
if: failure() if: failure()
run: echo "LOGFILENAME=logs-$(echo ${{ matrix.app_name }} | tr '/' '_')" >> $GITHUB_ENV run: echo "LOGFILENAME=logs-$(echo ${{ matrix.app_name }} | tr '/' '_')" >> $GITHUB_ENV
- name: stop containers
run: |
docker rm -f $(docker ps -qa) || true
docker network rm $(docker network ls -q) || true
docker system prune --volumes -f
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
if: failure() if: failure()
with: with:

View File

@ -87,5 +87,5 @@ fi
if [ "$WANT_JSON" = 'yes' ]; then if [ "$WANT_JSON" = 'yes' ]; then
echo "${RESULT}" | xargs | tr -d '\n' | jq -R -s -c 'split(" ")' echo "${RESULT}" | xargs | tr -d '\n' | jq -R -s -c 'split(" ")'
else else
echo "${RESULT}" | xargs echo "${RESULT}"
fi fi