Merge pull request #250 from CartoDB/fix/ch175898/gcp-github-actions

fixed gcloud github actions

.github/workflows/main.yml

@@ -0,0 +1,39 @@
+name: data-services PR testing
+on: push
+jobs:
+  data-services:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        pg_version: [10, 12]
+    env:
+        PG_VERSION: ${{ matrix.pg_version }}
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - 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: docker pull gcr.io/cartodb-on-gcp-ci-testing/cartodb-postgresql-base:${{ matrix.pg_version }}
+
+      - name: Checkout ci tools repository
+        uses: actions/checkout@v2
+        with:
+          repository: CartoDB/ci-tools
+          path: ci-tools
+          token: ${{ secrets.CARTOFANTE_PAT }}
+
+      - name: Copy ci files to root
+        run: cp ci-tools/repos/${{ github.event.repository.name }}/* .
+
+      - name: Start docker-compose services
+        run: docker-compose -f docker-compose.yaml up -d
+
+      - name: Run tests
+        run: docker-compose -f docker-compose.yaml exec -T postgres-server bash -c "cd /data-services/geocoder/extension && make clean all install installcheck"
+        timeout-minutes: 5

geocoder/.gitignore

@@ -1 +1,2 @@
 db_dumps/
+data_patches/

geocoder/admin0/patches/20181011_add_synonyms_for_swaziland.sql

@@ -0,0 +1,9 @@
+DO $$
+  DECLARE updated INTEGER;
+BEGIN
+  SELECT count(*) FROM admin0_synonyms WHERE adm0_a3 = 'SWZ' GROUP BY adm0_a3 HAVING count(*) > 0 INTO updated;
+  IF updated = 4 THEN
+    INSERT INTO admin0_synonyms (name, rank, adm0_a3, name_) SELECT 'Eswatini' as name, 6, adm0_a3, 'eswatini' as name_ FROM admin0_synonyms WHERE name_ = 'swaziland';
+    INSERT INTO admin0_synonyms (name, rank, adm0_a3, name_) SELECT 'Kingdom of Eswatini' as name, 7, adm0_a3, 'kingdomofeswatini' as name_ FROM admin0_synonyms WHERE name_ = 'swaziland';
+  END IF;
+END$$;

geocoder/admin0/patches/20210118_add_renamed_country_north_macedonia.sql

@@ -0,0 +1,9 @@
+DO $$
+  DECLARE updated INTEGER;
+BEGIN
+  SELECT count(*) FROM admin0_synonyms WHERE adm0_a3 = 'MKD' GROUP BY adm0_a3 HAVING count(*) > 0 INTO updated;
+  IF updated = 6 THEN
+    INSERT INTO admin0_synonyms (name, rank, adm0_a3, name_) SELECT 'North Macedonia' as name, 6, adm0_a3, 'northmacedonia' as name_ FROM admin0_synonyms WHERE name_ = 'macedonia';
+    INSERT INTO admin0_synonyms (name, rank, adm0_a3, name_) SELECT 'Republic of North Macedonia' as name, 7, adm0_a3, 'republicofnorthmacedonia' as name_ FROM admin0_synonyms WHERE name_ = 'macedonia';
+  END IF;
+END$$;

geocoder/admin1/patches/20190111_france_regions_typos.sql

@@ -0,0 +1,9 @@
+UPDATE global_province_polygons
+  SET synonyms = array_append(array_remove(synonyms, 'meurhe-et-moselle'), 'meurthe-et-moselle'),
+      "name" = 'Meurthe-et-Moselle'
+  WHERE adm1_code = 'FRA-5325';
+
+UPDATE global_province_polygons
+  SET synonyms = array_append(array_remove(synonyms, 'seien-et-marne'), 'seine-et-marne'),
+      "name" = 'Seine-et-Marne'
+  WHERE adm1_code = 'FRA-5342';

geocoder/admin1/patches/20220325_france_region_haut-rhin_typo.sql

@@ -0,0 +1,3 @@
+UPDATE global_province_polygons
+  SET synonyms = array_append(array_remove(synonyms, 'haut-rhin'), 'haut-rhin')
+  WHERE adm1_code = 'FRA-5296';

geocoder/geocoder_download_patches.sh

@@ -8,7 +8,11 @@ PATCHES_LIST="20160203_countries_bh_isocode.sql
 20160622_countries_synonym_congo.sql
 20171004_merge_corsica_and_france.sql
 20180117_hsinchu_synonyms.sql
-20180306_add_ssd_rows_for_south_sudan.sql"
+20180306_add_ssd_rows_for_south_sudan.sql
+20181011_add_synonyms_for_swaziland.sql
+20190111_france_regions_typos.sql
+20210118_add_renamed_country_north_macedonia.sql
+20220325_france_region_haut-rhin_typo.sql"
 
 mkdir -p $TARGET_DIR_PATCHES