Skip to content

Commit

Permalink
don't put path inside tar
Browse files Browse the repository at this point in the history 
replace mingw epel with mirror
  • Loading branch information
Vasily Galkin committed Sep 27, 2022
1 parent 1cb3dac commit f60bdff
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
8 changes: 5 additions & 3 deletions .github/actions/build-in-docker/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
FROM ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main-centos
ARG EPEL7_PRE_MINGW_REMOVE=https://dl.fedoraproject.org/pub/archive/epel/7.2019-05-29/x86_64/Packages
ARG EPEL7_PRE_MINGW_REMOVE=http://mirrors.nipa.cloud/epel/7/x86_64/Packages
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.64 -t aarch64-unknown-linux-gnu -t x86_64-pc-windows-gnu
RUN rpm -i http://springdale.princeton.edu/data/springdale/7/x86_64/os/Computational/glibc-aarch64-linux-gnu-devel-2.24-2.sdl7.2.noarch.rpm http://springdale.princeton.edu/data/springdale/7/x86_64/os/Computational/glibc-aarch64-linux-gnu-2.24-2.sdl7.2.noarch.rpm http://springdale.princeton.edu/data/springdale/7/x86_64/os/Computational/binutils-aarch64-linux-gnu-2.26-6.sdl7.x86_64.rpm http://springdale.princeton.edu/data/springdale/7/x86_64/os/Computational/gcc-aarch64-linux-gnu-4.8.1-5.2.sdl7.1.x86_64.rpm http://springdale.princeton.edu/data/springdale/7/x86_64/os/Computational/cross-binutils-common-2.26-6.sdl7.noarch.rpm http://springdale.princeton.edu/data/springdale/7/x86_64/os/Computational/cross-gcc-common-4.8.1-5.2.sdl7.1.noarch.rpm
RUN cd /usr/aarch64-linux-gnu/ && ln -s lib lib64 && curl http://mirror.centos.org/altarch/7/os/aarch64/Packages/libgcc-4.8.5-44.el7.aarch64.rpm -o - | rpm2cpio | cpio --no-absolute-filenames -iv '*libgcc_s*' && ln -fs libgcc_s.so.1 lib64/libgcc_s.so
RUN rpm -i https://dl.fedoraproject.org/pub/archive/epel/7.2019-05-29/x86_64/Packages/m/mingw-binutils-generic-2.25-1.el7.x86_64.rpm https://dl.fedoraproject.org/pub/archive/epel/7.2019-05-29/x86_64/Packages/m/mingw64-binutils-2.25-1.el7.x86_64.rpm https://dl.fedoraproject.org/pub/archive/epel/7.2019-05-29/x86_64/Packages/m/mingw64-filesystem-101-1.el7.noarch.rpm https://dl.fedoraproject.org/pub/archive/epel/7.2019-05-29/x86_64/Packages/m/mingw-filesystem-base-101-1.el7.noarch.rpm
RUN rpm -i https://dl.fedoraproject.org/pub/archive/epel/7.2019-05-29/x86_64/Packages/m/mingw64-cpp-4.9.3-1.el7.x86_64.rpm https://dl.fedoraproject.org/pub/archive/epel/7.2019-05-29/x86_64/Packages/m/mingw64-crt-4.0.4-3.el7.noarch.rpm https://dl.fedoraproject.org/pub/archive/epel/7.2019-05-29/x86_64/Packages/m/mingw64-headers-4.0.4-5.el7.noarch.rpm https://dl.fedoraproject.org/pub/archive/epel/7.2019-05-29/x86_64/Packages/m/mingw64-winpthreads-4.0.4-1.el7.noarch.rpm https://dl.fedoraproject.org/pub/archive/epel/7.2019-05-29/x86_64/Packages/m/mingw64-winpthreads-static-4.0.4-1.el7.noarch.rpm
RUN rpm -i https://dl.fedoraproject.org/pub/archive/epel/7.2019-05-29/x86_64/Packages/m/mingw64-gcc-4.9.3-1.el7.x86_64.rpm
RUN rpm -i $EPEL7_PRE_MINGW_REMOVE/m/mingw-binutils-generic-2.25-1.el7.x86_64.rpm $EPEL7_PRE_MINGW_REMOVE/m/mingw64-binutils-2.25-1.el7.x86_64.rpm $EPEL7_PRE_MINGW_REMOVE/m/mingw64-filesystem-101-1.el7.noarch.rpm $EPEL7_PRE_MINGW_REMOVE/m/mingw-filesystem-base-101-1.el7.noarch.rpm
RUN rpm -i $EPEL7_PRE_MINGW_REMOVE/m/mingw64-cpp-4.9.3-1.el7.x86_64.rpm $EPEL7_PRE_MINGW_REMOVE/m/mingw64-crt-4.0.4-3.el7.noarch.rpm $EPEL7_PRE_MINGW_REMOVE/m/mingw64-headers-4.0.4-5.el7.noarch.rpm $EPEL7_PRE_MINGW_REMOVE/m/mingw64-winpthreads-4.0.4-1.el7.noarch.rpm $EPEL7_PRE_MINGW_REMOVE/m/mingw64-winpthreads-static-4.0.4-1.el7.noarch.rpm
RUN rpm -i $EPEL7_PRE_MINGW_REMOVE/m/mingw64-gcc-4.9.3-1.el7.x86_64.rpm

ENTRYPOINT ["/github/workspace/.github/actions/build-in-docker/build-in-docker.sh"]
4 changes: 2 additions & 2 deletions .github/actions/build-in-docker/build-in-docker.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ cargo build --release --target x86_64-unknown-linux-gnu
cargo build --release --target aarch64-unknown-linux-gnu
mkdir target/artifacts
cp target/x86_64-pc-windows-gnu/release/memtest_vulkan.exe target/artifacts/memtest_vulkan-${GITHUB_REF_NAME}.exe
tar cJf target/artifacts/x86_64-linux-memtest_vulkan-${GITHUB_REF_NAME}.tar.xz target/x86_64-unknown-linux-gnu/release/memtest_vulkan
tar cJf target/artifacts/aarch64-linux-memtest_vulkan-${GITHUB_REF_NAME}.tar.xz target/aarch64-unknown-linux-gnu/release/memtest_vulkan
tar cJf target/artifacts/x86_64-linux-memtest_vulkan-${GITHUB_REF_NAME}.tar.xz -C target/x86_64-unknown-linux-gnu/release memtest_vulkan
tar cJf target/artifacts/aarch64-linux-memtest_vulkan-${GITHUB_REF_NAME}.tar.xz -C target/aarch64-unknown-linux-gnu/release memtest_vulkan

0 comments on commit f60bdff

Please sign in to comment.