From de33fec79f86d600cbfef81ba0a6c061c597185c Mon Sep 17 00:00:00 2001 From: alvarorm22 Date: Fri, 27 Aug 2021 11:55:53 +0200 Subject: [PATCH 1/4] fixed gcloud github actions setup --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bb9b891..3c8fcec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: run: echo "CLOUDSDK_PYTHON=/usr/bin/python" >> $GITHUB_ENV - name: Setup gcloud authentication - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master + uses: google-github-actions/setup-gcloud@master with: service_account_key: ${{ secrets.GCS }} From 24b17128fcd06d169ccb32d86a2a1d657797d1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez=20Ruiz?= Date: Tue, 21 Dec 2021 10:35:47 +0100 Subject: [PATCH 2/4] Delete gcloud from CI [ch-198662] --- .github/workflows/main.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c8fcec..2e442be 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,13 +15,14 @@ jobs: - name: Set CLOUDSDK_PYTHON path run: echo "CLOUDSDK_PYTHON=/usr/bin/python" >> $GITHUB_ENV - - name: Setup gcloud authentication - uses: google-github-actions/setup-gcloud@master - with: - service_account_key: ${{ secrets.GCS }} + - name: Set up docker registry + env: + SA_TO_USE: ${{ secrets.GCS }} + run: | + echo "${SA_TO_USE}" | base64 -d | docker login -u _json_key --password-stdin https://gcr.io - name: Pull base image - run: gcloud auth configure-docker && docker pull gcr.io/cartodb-on-gcp-ci-testing/cartodb-postgresql-base:${{ matrix.pg_version }} + run: docker pull gcr.io/cartodb-on-gcp-ci-testing/cartodb-postgresql-base:${{ matrix.pg_version }} - name: Checkout ci tools repository uses: actions/checkout@v2 From 1925bb60828c561a4fc69580f0fe2e046a9f5a22 Mon Sep 17 00:00:00 2001 From: Miguel Angel Moreno Date: Mon, 7 Mar 2022 16:49:11 +0100 Subject: [PATCH 3/4] UPgrade pip --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e442be..c4f2bf1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,7 +42,7 @@ jobs: if: env.PG_VERSION == 12 - name: Install required python libs - run: docker-compose -f docker-compose.yaml exec -T postgres-server bash -c "cd /dataservices-api/server/ && pip install -U -r ./lib/python/cartodb_services/requirements.txt && pip install -U ./lib/python/cartodb_services" + run: docker-compose -f docker-compose.yaml exec -T postgres-server bash -c "cd /dataservices-api/server/ && pip install --upgrade pip && pip install -U -r ./lib/python/cartodb_services/requirements.txt && pip install -U ./lib/python/cartodb_services" - name: Run python library tests run: docker-compose -f docker-compose.yaml exec -T postgres-server bash -c "cd /dataservices-api/server/ && MAPBOX_API_KEY=$MAPBOX_API_KEY TOMTOM_API_KEY=$TOMTOM_API_KEY GEOCODIO_API_KEY=$GEOCODIO_API_KEY nosetests lib/python/cartodb_services/test" From d8b00307cd88dde8743d3bbd095cdd1cf9d36c6e Mon Sep 17 00:00:00 2001 From: Miguel Angel Moreno Date: Mon, 7 Mar 2022 16:53:12 +0100 Subject: [PATCH 4/4] Revert "UPgrade pip" This reverts commit 1925bb60828c561a4fc69580f0fe2e046a9f5a22. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c4f2bf1..2e442be 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,7 +42,7 @@ jobs: if: env.PG_VERSION == 12 - name: Install required python libs - run: docker-compose -f docker-compose.yaml exec -T postgres-server bash -c "cd /dataservices-api/server/ && pip install --upgrade pip && pip install -U -r ./lib/python/cartodb_services/requirements.txt && pip install -U ./lib/python/cartodb_services" + run: docker-compose -f docker-compose.yaml exec -T postgres-server bash -c "cd /dataservices-api/server/ && pip install -U -r ./lib/python/cartodb_services/requirements.txt && pip install -U ./lib/python/cartodb_services" - name: Run python library tests run: docker-compose -f docker-compose.yaml exec -T postgres-server bash -c "cd /dataservices-api/server/ && MAPBOX_API_KEY=$MAPBOX_API_KEY TOMTOM_API_KEY=$TOMTOM_API_KEY GEOCODIO_API_KEY=$GEOCODIO_API_KEY nosetests lib/python/cartodb_services/test"