Skip to content

Commit

Permalink
build: fix caching
Browse files Browse the repository at this point in the history
  • Loading branch information
developStorm committed Jul 12, 2023
1 parent 53119f7 commit 2d23ee3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,5 @@ jobs:
cache-to: type=registry,ref=${{ fromJSON(steps.meta.outputs.json).tags[0] }}-buildcache,mode=max
platforms: linux/amd64,linux/arm64
build-args: |
GITHUB_SHA=${{ github.sha }}
GITHUB_RUN_ID=${{ github.run_id }}
GITHUB_SERVER_URL=${{ github.server_url }}
GITHUB_REPOSITORY=${{ github.repository }}
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ ENV GCC_MIRRORS \
https://ftpmirror.gnu.org/gcc

ARG GCC_VERSION
ARG GITHUB_SHA="dev-build"
ARG GITHUB_RUN_ID="dev-build"
ARG GITHUB_SERVER_URL=""
ARG GITHUB_REPOSITORY=""

Expand Down Expand Up @@ -63,7 +61,7 @@ RUN set -ex; \
--prefix=/usr/um/gcc-${GCC_VERSION} \
--disable-multilib \
--enable-languages=c,c++ \
--with-pkgversion="Project CAENTainer, Rev $GITHUB_SHA, Build $GITHUB_RUN_ID" \
--with-pkgversion="Project CAENTainer, $GITHUB_SERVER_URL/$GITHUB_REPOSITORY" \
--with-bugurl="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/issues"; \
make -j"$(nproc)"; \
make install-strip; \
Expand Down

0 comments on commit 2d23ee3

Please sign in to comment.