Skip to content

Commit 253d756

Browse files
authored
chore: get the rocky-linux-9 builds working again (#15828)
1 parent 18c06b5 commit 253d756

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

ci/cloudbuild/cloudbuild.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ steps:
119119

120120
# Runs the specified build in the image that was created in the first step.
121121
- name: '${_POOL_REGION}-docker.pkg.dev/${PROJECT_ID}/gcb/${_IMAGE}:${BUILD_ID}'
122+
id: 'build.sh'
122123
entrypoint: 'ci/cloudbuild/build.sh'
123124
args: [ '--local', '--build', '${_BUILD_NAME}' ]
124125
secretEnv: ['CODECOV_TOKEN', 'UD', 'UD_PROJECT', 'UD_REGION', 'UD_ZONE', 'UD_SERVICE_ACCOUNT', 'UD_SERVICE_ACCOUNT_NAME', 'UD_IMPERSONATED_SERVICE_ACCOUNT_NAME', 'UD_IDTOKEN_SA_IMPERSONATION_CRED', 'UD_FETCH_OIDC_TOKEN', 'UD_EXTERNAL_ACCOUNT_CRED']
@@ -136,6 +137,7 @@ steps:
136137

137138
# Remove the image created by this build.
138139
- name: 'gcr.io/google.com/cloudsdktool/cloud-sdk'
140+
id: 'remove-image'
139141
allowFailure: true
140142
entrypoint: 'bash'
141143
args:
@@ -147,6 +149,7 @@ steps:
147149
# Cancels in-progress builds for previous commits in the current PR so we can
148150
# free up resources to start running the builds for the new commit.
149151
- name: 'gcr.io/google.com/cloudsdktool/cloud-sdk'
152+
id: 'cancel-in-progress-builds-for-PR'
150153
allowFailure: true
151154
waitFor: [ '-' ]
152155
entrypoint: 'bash'

ci/cloudbuild/dockerfiles/demo-rockylinux-9.Dockerfile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,16 @@ RUN dnf makecache && \
2626
dnf install -y epel-release && \
2727
dnf makecache && \
2828
dnf install -y cmake findutils gcc-c++ git make openssl-devel \
29-
patch zlib-devel libcurl-devel c-ares-devel tar wget which
29+
patch zlib-devel libcurl-devel c-ares-devel tar wget which \
30+
autoconf automake libtool binutils
31+
# ```
32+
33+
# Set some useful environment variables.
34+
35+
# ```bash
36+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
37+
ENV CC=/usr/bin/gcc
38+
ENV CXX=/usr/bin/g++
3039
# ```
3140

3241
# Rocky Linux's version of `pkg-config` (https://github.com/pkgconf/pkgconf) is

doc/packaging.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1199,7 +1199,16 @@ sudo dnf update -y && \
11991199
sudo dnf install -y epel-release && \
12001200
sudo dnf makecache && \
12011201
sudo dnf install -y cmake findutils gcc-c++ git make openssl-devel \
1202-
patch zlib-devel libcurl-devel c-ares-devel tar wget which
1202+
patch zlib-devel libcurl-devel c-ares-devel tar wget which \
1203+
autoconf automake libtool binutils
1204+
```
1205+
1206+
Set some useful environment variables.
1207+
1208+
```bash
1209+
export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
1210+
export CC=/usr/bin/gcc
1211+
export CXX=/usr/bin/g++
12031212
```
12041213

12051214
Rocky Linux's version of `pkg-config` (https://github.com/pkgconf/pkgconf) is

0 commit comments

Comments
 (0)