fix(ci): Ensure right working directory for docker run

emqx · Dec 11, 2020 · 5796a07 · 5796a07
1 parent af3d927
commit 5796a07
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/.github/workflows/build_cross_packages.yaml b/.github/workflows/build_cross_packages.yaml
@@ -125,8 +125,9 @@ jobs:
             -e GITHUB_RUN_ID=$GITHUB_RUN_ID \
             -e GITHUB_REF=$GITHUB_REF \
             -v $(pwd):/emqx-rel \
+            -w /emqx-rel \
             emqx/build-env:erl22.3-debian10 \
-            bash -c "make -C /emqx-rel deps-all"
+            bash -c "make deps-all"
     - name: downloads emqx zip packages
       env:
         SYSTEM: ${{ matrix.os }}
@@ -255,8 +256,9 @@ jobs:
             -e GITHUB_RUN_ID=$GITHUB_RUN_ID \
             -e GITHUB_REF=$GITHUB_REF \
             -v $(pwd):/emqx-rel \
+            -w /emqx-rel \
             emqx/build-env:erl22.3-alpine-amd64 \
-            sh -c "make -C /emqx-rel deps-emqx"
+            sh -c "make deps-emqx"
     - name: build emqx docker image
       env:
         ARCH: ${{ matrix.arch[0] }}
@@ -365,13 +367,14 @@ jobs:
         set -e -x -u
         version=$(echo ${{ github.ref }} | sed -r  "s ^refs/heads/|^refs/tags/(.*) \1 g")
         if [ ! -z $(echo $version | grep -oE "^[ev0-9]+\.[0-9]+(\.[0-9]+)?") ]; then
-          sudo make -C emqx-rel docker-prepare
+          cd emqx-rel
+          sudo make docker-prepare
           cd ./packages && for var in $(ls |grep docker |grep -v sha256); do unzip $var; sudo docker load < ${var%.*}; rm -f ${var%.*}; done && cd -
           echo ${{ secrets.DOCKER_HUB_TOKEN }} |sudo docker login -u ${{ secrets.DOCKER_HUB_USER }} --password-stdin
-          sudo EMQX_DEPS_DEFAULT_VSN=$version TARGET=emqx/emqx make -C emqx-rel docker-push
-          sudo EMQX_DEPS_DEFAULT_VSN=$version TARGET=emqx/emqx make -C emqx-rel docker-manifest-list
-          sudo EMQX_DEPS_DEFAULT_VSN=$version TARGET=emqx/emqx-edge make -C emqx-rel docker-push
-          sudo EMQX_DEPS_DEFAULT_VSN=$version TARGET=emqx/emqx-edge make -C emqx-rel docker-manifest-list
+          sudo EMQX_DEPS_DEFAULT_VSN=$version TARGET=emqx/emqx make docker-push
+          sudo EMQX_DEPS_DEFAULT_VSN=$version TARGET=emqx/emqx make docker-manifest-list
+          sudo EMQX_DEPS_DEFAULT_VSN=$version TARGET=emqx/emqx-edge make docker-push
+          sudo EMQX_DEPS_DEFAULT_VSN=$version TARGET=emqx/emqx-edge make docker-manifest-list
         fi
     - name: update repo.emqx.io
       run: |

diff --git a/.github/workflows/run_deps_tests.yaml b/.github/workflows/run_deps_tests.yaml
@@ -29,10 +29,11 @@ jobs:
             docker run -i --rm \
                 -e EMQX_DEPS_DEFAULT_VSN=$version \
                 -v $(pwd):/emqx-rel \
+                -w /emqx-rel \
                 emqx/build-env:erl22.3-debian10 \
-                bash -c "make -C /emqx-rel deps-emqx"
+                bash -c "make deps-emqx"
         - name: Install docker-compose
-          run: | 
+          run: |
             sudo curl -L "https://github.com/docker/compose/releases/download/1.25.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
             sudo chmod +x /usr/local/bin/docker-compose
         - name: docker-compose build
@@ -50,7 +51,7 @@ jobs:
             sudo chmod -R 777 ./emqx*/etc
             for var in $(ls |grep emqx); do
               if [ $var == "emqx_auth_mysql" ];then
-                sed -i "/auth.mysql.server/c auth.mysql.server = mysql_server:3306" ./$var/etc/emqx_auth_mysql.conf 
+                sed -i "/auth.mysql.server/c auth.mysql.server = mysql_server:3306" ./$var/etc/emqx_auth_mysql.conf
                 echo "auth.mysql.username = root" >> ./$var/etc/emqx_auth_mysql.conf
                 echo "auth.mysql.password = public" >> ./$var/etc/emqx_auth_mysql.conf
                 echo "auth.mysql.ssl.cafile =   /emqx-rel/_build/emqx/lib/emqx_auth_mysql/test/emqx_auth_mysql_SUITE_data/ca.pem" >> ./$var/etc/emqx_auth_mysql.conf
@@ -72,7 +73,7 @@ jobs:
             done
             cd -
         - name: run all test cases
-          run: docker exec emqx_auto_func_test_emqx_1 bash -c "make -C /emqx-rel ct -k"
+          run: docker exec emqx_auto_func_test_emqx_1 bash -c "make ct -k"
         - name: get the results
           if: always()
           run: docker exec emqx_auto_func_test_python_1 bash -c "pip install --upgrade pip && pip install beautifulsoup4 && cd /emqx-rel/tests && python /emqx-rel/.ci/deps_tests/boot.py"

diff --git a/.github/workflows/run_paho_tests.yaml b/.github/workflows/run_paho_tests.yaml
@@ -1,6 +1,6 @@
 name: Run paho tests
 
-on: 
+on:
   push:
     tags:
       - v*
@@ -19,7 +19,7 @@ jobs:
 
         steps:
         - name: Install docker-compose
-          run: | 
+          run: |
             sudo curl -L "https://github.com/docker/compose/releases/download/1.25.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
             sudo chmod +x /usr/local/bin/docker-compose
         - uses: actions/checkout@v1
@@ -36,8 +36,9 @@ jobs:
             docker run -i --rm \
               -e EMQX_DEPS_DEFAULT_VSN=$version \
               -v $(pwd):/emqx-rel \
+              -w /emqx-rel \
               emqx/build-env:erl22.3-debian10 \
-              bash -c "make -C /emqx-rel deps-emqx"
+              bash -c "make deps-emqx"
         - name: make emqx image
           run: TARGET=emqx/emqx make docker-build
         - name: make paho tests