cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #697 from CartoDB/chore/sc-198662/EPEL7Q9I

Browse Source 
Fix deprecation notice GHAction
This commit is contained in:
Manuel López Ruiz 2021-12-21 09:52:41 +01:00 committed by GitHub
commit 29160289c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.github/workflows/main.yml vendored
View File

@ -23,11 +23,13 @@ jobs:
submodules: true submodules: true
token: ${{ secrets.CARTOFANTE_PERSONAL_TOKEN }} token: ${{ secrets.CARTOFANTE_PERSONAL_TOKEN }}
- uses: google-github-actions/auth@v0
with:
credentials_json: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }}
- name: Setup gcloud authentication - name: Setup gcloud authentication
uses: google-github-actions/setup-gcloud@master uses: google-github-actions/setup-gcloud@master
with: with:
version: ${{env.GCLOUD_VERSION}} version: ${{env.GCLOUD_VERSION}}
service_account_key: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }}
- name: Configure docker and pull images - name: Configure docker and pull images
run: | run: |
@ -93,16 +95,20 @@ jobs:
path: 'docker-dev-env' path: 'docker-dev-env'
token: ${{ secrets.CARTOFANTE_PERSONAL_TOKEN }} token: ${{ secrets.CARTOFANTE_PERSONAL_TOKEN }}
- uses: google-github-actions/auth@v0
with:
credentials_json: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }}
- name: Set up gcloud I - name: Set up gcloud I
uses: google-github-actions/setup-gcloud@master uses: google-github-actions/setup-gcloud@master
with: with:
service_account_key: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }}
export_default_credentials: true
version: '297.0.1' # https://github.com/google-github-actions/setup-gcloud/issues/128 version: '297.0.1' # https://github.com/google-github-actions/setup-gcloud/issues/128
- name: Set up gcloud II - name: Set up gcloud II
env:
SA_TO_USE: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }}
run: | run: |
gcloud auth configure-docker # gcloud auth configure-docker
echo "${SA_TO_USE}" | base64 -d | docker login -u _json_key --password-stdin https://gcr.io
# Dev tests # Dev tests
- name: Download containers in background - name: Download containers in background
@ -137,6 +143,7 @@ jobs:
- name: Run dev tests - name: Run dev tests
working-directory: ./docker-dev-env working-directory: ./docker-dev-env
run: | run: |
set -e
source .env source .env
docker run --rm --name tavern-tester \ docker run --rm --name tavern-tester \
--env "CARTO_USER=${USER_USERNAME}" \ --env "CARTO_USER=${USER_USERNAME}" \
@ -186,17 +193,23 @@ jobs:
- name: Init onprem - name: Init onprem
working-directory: ./dockerize-onpremises working-directory: ./dockerize-onpremises
env:
COMPOSE_FILE: docker-compose.yml:ci/docker-compose.ci.yml
run: | run: |
./ci/init.sh ./ci/init.sh
- name: Install license - name: Install license
working-directory: ./dockerize-onpremises working-directory: ./dockerize-onpremises
env:
COMPOSE_FILE: docker-compose.yml:ci/docker-compose.ci.yml
run: | run: |
mkdir -p license && cp -f ci/test_license/dockerize-onpremises-tests-license.lic license/carto.lic mkdir -p license && cp -f ci/test_license/dockerize-onpremises-tests-license.lic license/carto.lic
./script/license.sh ./script/license.sh
- name: Run onprem tests - name: Run onprem tests
working-directory: ./dockerize-onpremises working-directory: ./dockerize-onpremises
env:
COMPOSE_FILE: docker-compose.yml:ci/docker-compose.ci.yml
run: | run: |
source .env source .env
source ci/.env.ci source ci/.env.ci
@ -213,6 +226,8 @@ jobs:
- name: Export onprem compose logs - name: Export onprem compose logs
working-directory: ./dockerize-onpremises working-directory: ./dockerize-onpremises
env:
COMPOSE_FILE: docker-compose.yml:ci/docker-compose.ci.yml
run: | run: |
docker-compose -f docker-compose.yml -f ci/docker-compose.ci.yml logs --no-color > onprem_docker_compose_logs docker-compose -f docker-compose.yml -f ci/docker-compose.ci.yml logs --no-color > onprem_docker_compose_logs
echo "Logs will be available during 14 days at gs://${GCS_BUCKET_NAME}/test_logs_${GITHUB_RUN_ID}/" echo "Logs will be available during 14 days at gs://${GCS_BUCKET_NAME}/test_logs_${GITHUB_RUN_ID}/"

4
.github/workflows/master.yml vendored
View File

@ -30,11 +30,13 @@ jobs:
docker build -f private/Dockerfile --label="org.opencontainers.image.created=$(date --rfc-3339=seconds)" --label=org.opencontainers.image.revision=${GITHUB_SHA} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:latest -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_REF##*/} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_SHA::7} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_REF##*/}--${GITHUB_SHA::7} . docker build -f private/Dockerfile --label="org.opencontainers.image.created=$(date --rfc-3339=seconds)" --label=org.opencontainers.image.revision=${GITHUB_SHA} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:latest -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_REF##*/} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_SHA::7} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_REF##*/}--${GITHUB_SHA::7} .
docker build -f private/Dockerfile.onprem --label="org.opencontainers.image.created=$(date --rfc-3339=seconds)" --label=org.opencontainers.image.revision=${GITHUB_SHA} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:latest -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:${GITHUB_REF##*/} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:${GITHUB_SHA::7} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:${GITHUB_REF##*/}--${GITHUB_SHA::7} . docker build -f private/Dockerfile.onprem --label="org.opencontainers.image.created=$(date --rfc-3339=seconds)" --label=org.opencontainers.image.revision=${GITHUB_SHA} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:latest -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:${GITHUB_REF##*/} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:${GITHUB_SHA::7} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:${GITHUB_REF##*/}--${GITHUB_SHA::7} .
- uses: google-github-actions/auth@v0
with:
credentials_json: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }}
- name: Setup gcloud authentication - name: Setup gcloud authentication
uses: google-github-actions/setup-gcloud@master uses: google-github-actions/setup-gcloud@master
with: with:
version: ${{env.GCLOUD_VERSION}} version: ${{env.GCLOUD_VERSION}}
service_account_key: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }}
- name: Configure docker - name: Configure docker
run: gcloud auth configure-docker run: gcloud auth configure-docker