From de33fec79f86d600cbfef81ba0a6c061c597185c Mon Sep 17 00:00:00 2001 From: alvarorm22 Date: Fri, 27 Aug 2021 11:55:53 +0200 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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 04/10] 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" From 1794039c6b19c2c8a19b4a52d24046ce59e0c31f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez=20Ruiz?= Date: Wed, 30 Mar 2022 17:50:07 +0200 Subject: [PATCH 05/10] Changes applyed to `4STN0GNB` --- .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 52fb8b087589bc839d261d4d5c1142e853776044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez=20Ruiz?= Date: Wed, 30 Mar 2022 17:50:08 +0200 Subject: [PATCH 06/10] Changes applyed to `0EDAHT1N` --- .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 3c8fcec..e7bf780 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: google-github-actions/setup-gcloud@master + uses: google-github-actions/setup-gcloud@v0 with: service_account_key: ${{ secrets.GCS }} From 8caa73526273cf137c05ff3dba0183ec5c500825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Hern=C3=A1ndez?= Date: Thu, 1 Sep 2022 15:27:28 +0200 Subject: [PATCH 07/10] fix action --- .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..7888891 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: GoogleCloudPlatform/github-actions/setup-gcloud@v0 with: service_account_key: ${{ secrets.GCS }} From 10a34da23253fc38a6d69205815c03779a874f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Hern=C3=A1ndez?= Date: Thu, 1 Sep 2022 15:31:46 +0200 Subject: [PATCH 08/10] trying to fix action --- .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 7888891..67ecb72 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@v0 + uses: 'google-github-actions/setup-gcloud@v0' with: service_account_key: ${{ secrets.GCS }} From 2819382dd0e73e027c1a3c89093de4d5e3890f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Hern=C3=A1ndez?= Date: Thu, 1 Sep 2022 15:38:01 +0200 Subject: [PATCH 09/10] fixing CI --- .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 67ecb72..e2a6e8e 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: 'google-github-actions/setup-gcloud@v0' + uses: 'google-github-actions/setup-gcloud@v0.6.0' with: service_account_key: ${{ secrets.GCS }} From 063cac1b6599fc9e5d944517c774ace0dba00c85 Mon Sep 17 00:00:00 2001 From: alberhander Date: Thu, 1 Sep 2022 16:15:30 +0200 Subject: [PATCH 10/10] try fix CI --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e2a6e8e..5a51ac5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: matrix: pg_version: [10, 12] env: - PG_VERSION: ${{ matrix.pg_version }} + PG_VERSION: ${{ matrix.pg_version }} steps: - uses: actions/checkout@v1 @@ -16,7 +16,7 @@ jobs: run: echo "CLOUDSDK_PYTHON=/usr/bin/python" >> $GITHUB_ENV - name: Setup gcloud authentication - uses: 'google-github-actions/setup-gcloud@v0.6.0' + uses: google-github-actions/setup-gcloud@v0 with: service_account_key: ${{ secrets.GCS }} @@ -46,9 +46,9 @@ jobs: - 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" env: - MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }} - TOMTOM_API_KEY: ${{ secrets.TOMTOM_API_KEY }} - GEOCODIO_API_KEY: ${{ secrets.GEOCODIO_API_KEY }} + MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }} + TOMTOM_API_KEY: ${{ secrets.TOMTOM_API_KEY }} + GEOCODIO_API_KEY: ${{ secrets.GEOCODIO_API_KEY }} timeout-minutes: 5 - name: Run server tests