Skip to content

Commit

Permalink
fix root folder on bookworm (by resetting workdir to /)
Browse files Browse the repository at this point in the history
fix artifact already exists, by appending os suffix
  • Loading branch information
jakoch committed Jul 7, 2024
1 parent 5cad01b commit 91dd0fd
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 24 deletions.
15 changes: 4 additions & 11 deletions .devcontainer/debian/bookworm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -427,20 +427,13 @@ RUN ./configure \
make install-target-libgcc && \
make install-target-libsanitizer && \
make install-target-libatomic && \
cd / && \
rm -rf gcc-13.3.0 && \
apt-get autoremove -y libmpfr-dev libgmp3-dev libmpc-dev

# we remove the gcc source folder and dependencies on the configure/make/make install step,
# because then the gcc source folder is not cached, resulting in a smaller layer.
# but for debugging gcc compilation issues,
# its nice to have the following RUN command as extra image layer.
# if you uncomment the following lines, comment the related lines above.
# return from /gcc-x.y.z folder
WORKDIR /

# remove gcc source folder and dependencies
#RUN cd / && \
# rm -rf gcc-13.3.0 && \
# apt-get autoremove -y libmpfr-dev libgmp3-dev libmpc-dev
RUN rm -rf gcc-13.3.0 && \
apt-get autoremove -y libmpfr-dev libgmp3-dev libmpc-dev

# reset default compiler to clang
ENV CC=/usr/bin/clang \
Expand Down
13 changes: 3 additions & 10 deletions .devcontainer/debian/trixie/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -435,19 +435,12 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# make install-target-libgcc && \
# make install-target-libsanitizer && \
# make install-target-libatomic && \
# cd / && \
# rm -rf gcc-13.3.0 && \
# apt-get autoremove -y libmpfr-dev libgmp3-dev libmpc-dev

# we remove the gcc source folder and dependencies on the configure/make/make install step,
# because then the gcc source folder is not cached, resulting in a smaller layer.
# but for debugging gcc compilation issues,
# its nice to have the following RUN command as extra image layer.
# if you uncomment the following lines, comment the related lines above.
# return from /gcc-x.y.z folder
#WORKDIR /

# remove gcc source folder and dependencies
#RUN cd / && \
# rm -rf gcc-13.3.0 && \
#RUN rm -rf gcc-13.3.0 && \
# apt-get autoremove -y libmpfr-dev libgmp3-dev libmpc-dev

# reset default compiler to clang
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ jobs:
jq -n --arg version "${{ github.ref_name }}" \
--arg commit "${{ github.sha }}" \
--arg date "$(date -u +%F)" \
'{ version: $version, commit: $commit, date: $date }' > info.json
'{ version: $version, commit: $commit, date: $date }' > info-${{ matrix.config.debian_codename }}.json
- name: Check show-tool-versions.sh and make executable
run: |
Expand Down Expand Up @@ -222,9 +222,9 @@ jobs:
- name: 📦 Provide the version info and info.json as a release asset
uses: actions/upload-artifact@v4 # https://github.com/actions/upload-artifact
with:
name: version-info
name: version-info-${{ matrix.config.debian_codename }}
path: |
info.json
info-${{ matrix.config.debian_codename }}.json
versions-${{ matrix.config.debian_codename }}-base.md
versions-${{ matrix.config.debian_codename }}-with-vulkan.md
README-${{ matrix.config.debian_codename }}-base.md
Expand Down

0 comments on commit 91dd0fd

Please sign in to comment.