From b0f95ac689602a01f0fdebfad859291663c7c61c Mon Sep 17 00:00:00 2001 From: Hamid Ghadyani Date: Mon, 18 Jul 2022 00:14:15 -0400 Subject: [PATCH] Trying to find armv7's strip cmd name. - Removing unused Dockerfile --- .github/workflows/prepare_artifact.sh | 4 ++++ .github/workflows/reusable_linux.yml | 15 --------------- .github/workflows/reusable_macos.yml | 15 --------------- Dockerfile-aarch64-unknown-linux-gnu | 10 ---------- Dockerfile-armv7-unknown-linux-gnueabihf | 10 ---------- 5 files changed, 4 insertions(+), 50 deletions(-) delete mode 100644 Dockerfile-aarch64-unknown-linux-gnu delete mode 100644 Dockerfile-armv7-unknown-linux-gnueabihf diff --git a/.github/workflows/prepare_artifact.sh b/.github/workflows/prepare_artifact.sh index 8fd2b1b..4817c8d 100755 --- a/.github/workflows/prepare_artifact.sh +++ b/.github/workflows/prepare_artifact.sh @@ -12,6 +12,10 @@ create_linux() { strip_cmd="/usr/bin/arm-linux-gnueabi-strip" fi ls "/usr/bin/*strip*" || true + which "arm-linux-gnu-strip" || true + which "arm-linux-gnueabi-strip" || true + which "arm-linux-gnueabihf-strip" || true + cp target/"$TARGET/$BUILD_TYPE"/rmate . || true "$strip_cmd" rmate || true tar czvf "$artifacts" rmate diff --git a/.github/workflows/reusable_linux.yml b/.github/workflows/reusable_linux.yml index b177153..8e30e95 100644 --- a/.github/workflows/reusable_linux.yml +++ b/.github/workflows/reusable_linux.yml @@ -92,18 +92,3 @@ jobs: path: | rmate_${{ inputs.target }}.tar.gz if-no-files-found: warn - - # release_binary: - # name: Release rmate - # runs-on: ubuntu-latest - # needs: build_binary - # if: ${{ github.ref_type == 'tag' }} - # steps: - # - uses: actions/download-artifact@v2 - # with: - # name: upload-binary-artifact - # - uses: softprops/action-gh-release@v1 - # with: - # fail_on_unmatched_files: false - # files: | - # rmate_${{ inputs.target }}.tar.gz diff --git a/.github/workflows/reusable_macos.yml b/.github/workflows/reusable_macos.yml index 68ad981..70d5447 100644 --- a/.github/workflows/reusable_macos.yml +++ b/.github/workflows/reusable_macos.yml @@ -73,18 +73,3 @@ jobs: path: | rmate_${{ inputs.target }}.zip if-no-files-found: warn - - # release_binary: - # name: Release rmate - # runs-on: ubuntu-latest - # needs: build_binary - # if: ${{ github.ref_type == 'tag' }} - # steps: - # - uses: actions/download-artifact@v2 - # with: - # name: upload-binary-artifact - # - uses: softprops/action-gh-release@v1 - # with: - # fail_on_unmatched_files: false - # files: | - # rmate_${{ inputs.target }}.zip diff --git a/Dockerfile-aarch64-unknown-linux-gnu b/Dockerfile-aarch64-unknown-linux-gnu deleted file mode 100644 index ec606db..0000000 --- a/Dockerfile-aarch64-unknown-linux-gnu +++ /dev/null @@ -1,10 +0,0 @@ -FROM arm64v8/debian:stretch-slim - -SHELL ["/bin/bash", "-c"] -COPY qemu-aarch64-static /usr/bin -COPY qemu-arm-static /usr/bin - -COPY rmate /usr/bin/ - -# RUN file /usr/bin/rmate -CMD ["/usr/bin/qemu-aarch64-static", "/usr/bin/rmate", "-vvv", "-w", "Cargo.toml"] diff --git a/Dockerfile-armv7-unknown-linux-gnueabihf b/Dockerfile-armv7-unknown-linux-gnueabihf deleted file mode 100644 index 608bf89..0000000 --- a/Dockerfile-armv7-unknown-linux-gnueabihf +++ /dev/null @@ -1,10 +0,0 @@ -FROM arm32v7/debian:stretch-slim - -SHELL ["/bin/bash", "-c"] -COPY qemu-aarch64-static /usr/bin -COPY qemu-arm-static /usr/bin - -COPY rmate /usr/bin/ - -# RUN file /usr/bin/rmate -CMD ["/usr/bin/qemu-arm-static", "/usr/bin/rmate", "-vvv", "-w", "Cargo.toml"]