Skip to content

Commit d410d09

Browse files
committed
Merge branch 'install-gcloud-sdk-in-ci' into 'master'
fix: manage keyring files in trusted.gpg.d because apt-key is deprecated See merge request postgres-ai/database-lab!701
2 parents 533288f + 50c169c commit d410d09

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

engine/.gitlab-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ build-binary-client-master:
8585

8686
# Install google-cloud-sdk.
8787
- echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
88-
- curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
88+
- curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor | tee /usr/share/keyrings/cloud.google.gpg > /dev/null
8989
- apt-get update && apt-get install -y google-cloud-sdk
9090

9191
# Authenticate.
@@ -105,7 +105,7 @@ build-binary-client:
105105

106106
# Install google-cloud-sdk.
107107
- echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
108-
- curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
108+
- curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor | tee /usr/share/keyrings/cloud.google.gpg > /dev/null
109109
- apt-get update && apt-get install -y google-cloud-sdk
110110

111111
# Authenticate.
@@ -126,7 +126,7 @@ build-binary-client-rc:
126126

127127
# Install google-cloud-sdk.
128128
- echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
129-
- curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
129+
- curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor | tee /usr/share/keyrings/cloud.google.gpg > /dev/null
130130
- apt-get update && apt-get install -y google-cloud-sdk
131131

132132
# Authenticate.

0 commit comments

Comments
 (0)