Merge pull request #647 from Ilhasoft/hotfix/fix_version_tests

Solve conflicts with staging branch
weni-ai · Oct 13, 2021 · ca9319b · ca9319b
2 parents d0eba1e + 6eedda8
commit ca9319b
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 118 deletions.
diff --git a/.github/workflows/build-develop.yaml b/.github/workflows/build-develop.yaml
@@ -1,4 +1,4 @@
-name: Build Develop Image
+name: Build Develop Image Engine
 on:
   push:
     tags:
@@ -9,6 +9,8 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
+        with:
+          ref: develop
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
@@ -29,4 +31,3 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: bothubit/bothub-engine:${{ steps.vars.outputs.tag }}
-
diff --git a/.github/workflows/build-production.yaml b/.github/workflows/build-production.yaml
@@ -9,6 +9,8 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
+        with:
+          ref: master
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx

diff --git a/.github/workflows/build-staging.yaml b/.github/workflows/build-staging.yaml
@@ -1,4 +1,4 @@
-name: Build Staging Image
+name: Build Staging Image Engine
 on:
   push:
     tags:
@@ -9,6 +9,8 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
+        with:
+          ref: staging
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx

diff --git a/Pipfile b/Pipfile
@@ -40,7 +40,7 @@ django-elasticsearch-dsl-drf= "~=0.22.1"
 elasticsearch= "~=7.14.0"
 elasticsearch-dsl= "~=7.4.0"
 psycopg2-binary = "~=2.9.1"
-weni-protobuffers = "*"
+weni-protobuffers = "~=1.1.0"
 
 [dev-packages]
 "flake8" = "~=3.9.2"