udpate paths and pull submodule

This commit is contained in:
Álvaro Manera 2020-12-16 16:47:19 +01:00
parent a03d268260
commit ddb1b0c0d8

View File

@ -18,18 +18,20 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with:
submodules: true
- name: Build image - name: Build image
# we tag with "latest" but we don't push it on purpose. We use it as a base for the testing image # we tag with "latest" but we don't push it on purpose. We use it as a base for the testing image
run: | run: |
echo ${GITHUB_SHA::7} echo ${GITHUB_SHA::7}
echo ${GITHUB_REF##*/} echo ${GITHUB_REF##*/}
docker build -t gcr.io/$ARTIFACTS_PROJECT_ID/windshaft:latest -t gcr.io/$ARTIFACTS_PROJECT_ID/windshaft:${GITHUB_REF##*/} -t gcr.io/$ARTIFACTS_PROJECT_ID/windshaft:${GITHUB_SHA::7} -t gcr.io/$ARTIFACTS_PROJECT_ID/windshaft:${GITHUB_REF##*/}--${GITHUB_SHA::7} . docker build -f private/Dockerfile -t gcr.io/$ARTIFACTS_PROJECT_ID/windshaft:latest -t gcr.io/$ARTIFACTS_PROJECT_ID/windshaft:${GITHUB_REF##*/} -t gcr.io/$ARTIFACTS_PROJECT_ID/windshaft:${GITHUB_SHA::7} -t gcr.io/$ARTIFACTS_PROJECT_ID/windshaft:${GITHUB_REF##*/}--${GITHUB_SHA::7} .
- name: Build testing image - name: Build testing image
# here it uses the lastest from prev step to add the needed parts on top # here it uses the lastest from prev step to add the needed parts on top
run: | run: |
docker build -t gcr.io/$ARTIFACTS_PROJECT_ID/windshaft-test:latest -f Dockerfile.test . docker build -t gcr.io/$ARTIFACTS_PROJECT_ID/windshaft-test:latest -f private/Dockerfile.test .
- name: Setup gcloud authentication - name: Setup gcloud authentication
uses: google-github-actions/setup-gcloud@master uses: google-github-actions/setup-gcloud@master
@ -45,7 +47,7 @@ jobs:
docker pull gcr.io/cartodb-on-gcp-main-artifacts/redis:latest docker pull gcr.io/cartodb-on-gcp-main-artifacts/redis:latest
- name: Run tests inside container - name: Run tests inside container
run: docker-compose -f ci/docker-compose.yml run windshaft-tests run: docker-compose -f private/ci/docker-compose.yml run windshaft-tests
- name: Upload image - name: Upload image
run: | run: |