From b86a52077871b32b5e354771cac1c5bfbfb5359a Mon Sep 17 00:00:00 2001 From: Avindra Goolcharan Date: Sun, 13 Jun 2021 03:54:27 -0400 Subject: [PATCH 1/5] winapi fix --- bin/vendor-rust | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/bin/vendor-rust b/bin/vendor-rust index 8a0a056..792fe69 100755 --- a/bin/vendor-rust +++ b/bin/vendor-rust @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/sh # Packaging script for Rust: # create vendor tarball @@ -7,14 +7,14 @@ # remove previous artifact, if any destdir="/tmp" target="vendor.tar.xz" -if [[ -f "$target" ]]; then +if [ -f "$target" ]; then rm $target fi # target specific archive file="$1" -if [[ -z "$file" ]]; then +if [ -z "$file" ]; then project=$(basename "$PWD") file=$(ls ./*"${project}"*tar*) echo "Inferred $file as target" @@ -40,6 +40,13 @@ done CARGO_NET_GIT_FETCH_WITH_CLI=true cargo vendor +## Post-vendor fixes +if [ -d vendor/winapi ]; then + echo -n "WINAPI detected. Removing MS binaries... " + rm -fr vendor/winapi*gnu*/lib/*.a + echo "done" +fi + time tar -cf - vendor/ | xz -9 -c - > "$target" # get back to project dir @@ -53,4 +60,3 @@ ls -lh "$tarball" echo -n "Copying ..." cp "$tarball" . echo -n "done" - From 4013200b1d8c447d49ce0405391e17a9940d5ab5 Mon Sep 17 00:00:00 2001 From: Avindra Goolcharan Date: Sun, 13 Jun 2021 03:56:35 -0400 Subject: [PATCH 2/5] replace broken sc ci --- .github/workflows/ShellCheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ShellCheck.yml b/.github/workflows/ShellCheck.yml index 8e56aaf..51b42e7 100644 --- a/.github/workflows/ShellCheck.yml +++ b/.github/workflows/ShellCheck.yml @@ -8,6 +8,6 @@ jobs: steps: - uses: actions/checkout@v2 - name: Run ShellCheck - uses: ludeeus/action-shellcheck@master + uses: bewuethr/shellcheck-action@master env: SHELLCHECK_OPTS: -e SC2164 -e SC2039 -e SC1091 -e SC1090 -e SC2002 From 1d2006736f397f5db1c2cca34667e349175e6901 Mon Sep 17 00:00:00 2001 From: Avindra Goolcharan Date: Sun, 13 Jun 2021 03:57:33 -0400 Subject: [PATCH 3/5] x sc --- .github/workflows/ShellCheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ShellCheck.yml b/.github/workflows/ShellCheck.yml index 51b42e7..3994327 100644 --- a/.github/workflows/ShellCheck.yml +++ b/.github/workflows/ShellCheck.yml @@ -10,4 +10,4 @@ jobs: - name: Run ShellCheck uses: bewuethr/shellcheck-action@master env: - SHELLCHECK_OPTS: -e SC2164 -e SC2039 -e SC1091 -e SC1090 -e SC2002 + SHELLCHECK_OPTS: -e SC2164 From 46ff3e3a682b30c8149949865a1cb27aa8e71637 Mon Sep 17 00:00:00 2001 From: Avindra Goolcharan Date: Sun, 13 Jun 2021 03:58:17 -0400 Subject: [PATCH 4/5] 2002 --- .github/workflows/ShellCheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ShellCheck.yml b/.github/workflows/ShellCheck.yml index 3994327..0139a27 100644 --- a/.github/workflows/ShellCheck.yml +++ b/.github/workflows/ShellCheck.yml @@ -10,4 +10,4 @@ jobs: - name: Run ShellCheck uses: bewuethr/shellcheck-action@master env: - SHELLCHECK_OPTS: -e SC2164 + SHELLCHECK_OPTS: -e SC2002 From 89a5c0bc1332699f1f68f0b2dfc28e71c8e2676f Mon Sep 17 00:00:00 2001 From: Avindra Goolcharan Date: Sun, 13 Jun 2021 03:59:10 -0400 Subject: [PATCH 5/5] sc2164 --- .github/workflows/ShellCheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ShellCheck.yml b/.github/workflows/ShellCheck.yml index 0139a27..f207b78 100644 --- a/.github/workflows/ShellCheck.yml +++ b/.github/workflows/ShellCheck.yml @@ -10,4 +10,4 @@ jobs: - name: Run ShellCheck uses: bewuethr/shellcheck-action@master env: - SHELLCHECK_OPTS: -e SC2002 + SHELLCHECK_OPTS: -e SC2002 -e SC2164