File tree Expand file tree Collapse file tree 3 files changed +14
-10
lines changed
Expand file tree Collapse file tree 3 files changed +14
-10
lines changed Original file line number Diff line number Diff line change 7676 labels : ${{ steps.meta.outputs.labels }}
7777 build-args : |
7878 VERSION=0.0.0
79+ push : ${{ github.event_name != 'pull_request' }}
7980 cache-from : type=local,src=/tmp/.buildx-cache
8081 cache-to : type=local,dest=/tmp/.buildx-cache-new,mode=max
8182 -
@@ -169,6 +170,7 @@ jobs:
169170 labels : ${{ steps.meta.outputs.labels }}
170171 build-args : |
171172 VERSION=0.0.0
173+ push : ${{ github.event_name != 'pull_request' }}
172174 cache-from : type=local,src=/tmp/.buildx-cache
173175 cache-to : type=local,dest=/tmp/.buildx-cache-new,mode=max
174176 -
Original file line number Diff line number Diff line change @@ -34,6 +34,7 @@ RUN set -eux \
3434 aarch64-unknown-linux-musl \
3535 x86_64-apple-darwin \
3636 x86_64-unknown-linux-musl \
37+ x86_64-unknown-linux-gnu \
3738 && true
3839
3940COPY cargo/config.toml /root/.cargo/config.toml
@@ -45,10 +46,6 @@ RUN set -eux \
4546
4647# #### Libraries
4748
48- # pkg-config related environment variables
49- ENV PKG_CONFIG_ALLOW_CROSS=true
50- ENV PKG_CONFIG_ALL_STATIC=true
51-
5249RUN set -eux \
5350 && dpkg --add-architecture arm64 \
5451 && DEBIAN_FRONTEND=noninteractive apt-get update -qq \
@@ -71,7 +68,7 @@ RUN set -eux \
7168 && echo "Downloading zlib ${ZLIB_VERSION}..." \
7269 && curl -Lo zlib.tar.gz "https://www.zlib.net/fossils/zlib-${ZLIB_VERSION}.tar.gz" \
7370 && true
74-
71+
7572# x86_64 glibc
7673RUN set -eux \
7774 && mkdir zlib \
@@ -255,6 +252,10 @@ RUN set -eux \
255252
256253WORKDIR /root
257254
255+ # pkg-config related environment variables
256+ ENV PKG_CONFIG_ALLOW_CROSS=true
257+ ENV PKG_CONFIG_ALL_STATIC=true
258+
258259# OpenSSL related environment variables
259260ENV X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_STATIC=1
260261ENV X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_DIR=/usr/local/x86_64-linux-musl
Original file line number Diff line number Diff line change @@ -34,6 +34,7 @@ RUN set -eux \
3434 aarch64-unknown-linux-musl \
3535 x86_64-apple-darwin \
3636 x86_64-unknown-linux-musl \
37+ x86_64-unknown-linux-gnu \
3738 && true
3839
3940COPY cargo/config.toml /root/.cargo/config.toml
@@ -45,10 +46,6 @@ RUN set -eux \
4546
4647# #### Libraries
4748
48- # pkg-config related environment variables
49- ENV PKG_CONFIG_ALLOW_CROSS=true
50- ENV PKG_CONFIG_ALL_STATIC=true
51-
5249RUN set -eux \
5350 && dpkg --add-architecture amd64 \
5451 && DEBIAN_FRONTEND=noninteractive apt-get update -qq \
@@ -71,7 +68,7 @@ RUN set -eux \
7168 && echo "Downloading zlib ${ZLIB_VERSION}..." \
7269 && curl -Lo zlib.tar.gz "https://www.zlib.net/fossils/zlib-${ZLIB_VERSION}.tar.gz" \
7370 && true
74-
71+
7572# x86_64 glibc
7673RUN set -eux \
7774 && mkdir zlib \
@@ -252,6 +249,10 @@ RUN set -eux \
252249
253250WORKDIR /root
254251
252+ # pkg-config related environment variables
253+ ENV PKG_CONFIG_ALLOW_CROSS=true
254+ ENV PKG_CONFIG_ALL_STATIC=true
255+
255256# OpenSSL related environment variables
256257ENV X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_STATIC=1
257258ENV X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_DIR=/usr/local/x86_64-linux-musl
You can’t perform that action at this time.
0 commit comments