Skip to content

Commit

Permalink
Add support for buildTransitive in NuGet packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@lilith
lilith committed Aug 4, 2022
1 parent 3542b52 commit dc75ff1
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions ci/pack_nuget/pack.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ mkdir -p "$STAGING_DIR" || true
RELEASE_DIR="${SCRIPT_DIR}/../../${TARGET_DIR:-target}/release/"
RUNTIME_DIR="runtimes/${NUGET_RUNTIME}/native/"
PROPS_PATH="build/net45/${NUGET_PACKAGE_NAME}.targets"
PROPS_PATH_2="buildTransitive/net45/${NUGET_PACKAGE_NAME}.targets"
NUGET_OUTPUT_DIR="${SCRIPT_DIR}/../../artifacts/nuget"
NUGET_OUTPUT_FILE="${NUGET_OUTPUT_DIR}/${NUGET_COMBINED_NAME}.nupkg"
echo RELEASE_DIR=${RELEASE_DIR}
Expand Down Expand Up @@ -79,10 +80,12 @@ mkdir -p "$STAGING_DIR" || true
# add props
mkdir -p build/net45
cat ../../imageflow_x64.targets | sed -e "s/:rid:/$NUGET_RUNTIME/g" > "$PROPS_PATH"
cat ../../imageflow_x64.targets | sed -e "s/:rid:/$NUGET_RUNTIME/g" > "$PROPS_PATH_2"
elif [[ "${NUGET_RUNTIME}" == *'x86'* ]]; then
# add props
mkdir -p build/net45
cat ../../imageflow_x86.targets | sed -e "s/:rid:/$NUGET_RUNTIME/g" > "$PROPS_PATH"
cat ../../imageflow_x86.targets | sed -e "s/:rid:/$NUGET_RUNTIME/g" > "$PROPS_PATH_2"
fi
fi

Expand Down

2 comments on commit dc75ff1

@github-actions

This comment was marked as outdated.

Sign in to view

@github-actions
Copy link

@github-actions github-actions bot commented on dc75ff1 Aug 4, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@check-spelling-bot Report

🔴 Please review

See the 📜action log for details.

Unrecognized words (63) 
aarch
appleclang
autodeleted
bdd
Bikeshed
bools
BORLANDC
brackes
Conditionhandler
cppcoreguidelines
CPPUNWIND
CUDACC
cumn
defed
deoptimize
deoptimized
destructable
disttribution
erfinv
GCCs
generatortracker
GLIBCXX
gtest
hicpp
ibmxl
IGenerator
impls
iqr
ISingleton
libstd
LOGWRITE
lom
los
milleniumbug
monostate
NOINTERNAL
NOLINTNEXTLINE
nsamples
nttp
ORBIS
overallocating
pcg
Prefs
ptrdiff
Regehr
rotr
RTSS
RTX
skipq
SPDX
sqcb
sstr
stddev
STRINGIZE
TStorage
unregister
unscoped
URng
VARGS
Wgnu
Wnon
XLC
xorshifted
Previously acknowledged words that are now absent Bools lfirst llast prefs reimplementation rfirst rlast uft UNSUPPRESS
To accept ✔️ these unrecognized words as correct (and remove the previously acknowledged and now absent words), run the following commands

... in a clone of the git@github.com:imazen/imageflow.git repository
on the refs/tags/v1.7.2-rc66 branch (ℹ️ how do I use this?):

update_files() {
perl -e '
my @expect_files=qw('".github/actions/spell-check/expect/21a881426bac4ce7da7479525c41638edb10dab3.txt
.github/actions/spell-check/expect/4fd706fd879e80192d1ecef241faca522e84be19.txt
.github/actions/spell-check/expect/expect.txt"');
@ARGV=@expect_files;
my @stale=qw('"$patch_remove"');
my $re=join "|", @stale;
my $suffix=".".time();
my $previous="";
sub maybe_unlink { unlink($_[0]) if $_[0]; }
while (<>) {
if ($ARGV ne $old_argv) { maybe_unlink($previous); $previous="$ARGV$suffix"; rename($ARGV, $previous); open(ARGV_OUT, ">$ARGV"); select(ARGV_OUT); $old_argv = $ARGV; }
next if /^(?:$re)(?:(?:\r|\n)*$| .*)/; print;
}; maybe_unlink($previous);'
perl -e '
my $new_expect_file=".github/actions/spell-check/expect/dc75ff111c26e69f7ba6b33f59ad9dcbf700d04c.txt";
use File::Path qw(make_path);
use File::Basename qw(dirname);
make_path (dirname($new_expect_file));
open FILE, q{<}, $new_expect_file; chomp(my @words = <FILE>); close FILE;
my @add=qw('"$patch_add"');
my %items; @items{@words} = @words x (1); @items{@add} = @add x (1);
@words = sort {lc($a)."-".$a cmp lc($b)."-".$b} keys %items;
open FILE, q{>}, $new_expect_file; for my $word (@words) { print FILE "$word\n" if $word =~ /\w/; };
close FILE;
system("git", "add", $new_expect_file);
'
}

comment_json=$(mktemp)
curl -L -s -S \
-H "Content-Type: application/json" \
"https://api.github.com/repos/imazen/imageflow/comments/80343406" > "$comment_json"
comment_body=$(mktemp)
jq -r ".body // empty" "$comment_json" | tr -d "\\r" > $comment_body
rm $comment_json

patch_remove=$(perl -ne 'next unless s{^</summary>(.*)</details>$}{$1}; print' < "$comment_body")

patch_add=$(perl -e '$/=undef; $_=<>; if (m{Unrecognized words[^<]*</summary>\n*```\n*([^<]*)```\n*</details>$}m) { print "$1" } elsif (m{Unrecognized words[^<]*\n\n((?:\w.*\n)+)\n}m) { print "$1" };' < "$comment_body")

update_files
rm $comment_body
git add -u
Available dictionaries could cover words not in the dictionary

This includes both expected items (1071) from .github/actions/spell-check/expect/21a881426bac4ce7da7479525c41638edb10dab3.txt
.github/actions/spell-check/expect/4fd706fd879e80192d1ecef241faca522e84be19.txt
.github/actions/spell-check/expect/expect.txt and unrecognized words (63)

cspell:fullstack/fullstack.txt (181) covers 11 of them
cspell:aws/aws.txt (1485) covers 10 of them
cspell:rust/rust.txt (112) covers 9 of them
cspell:npm/npm.txt (671) covers 8 of them
cspell:java/java.txt (33524) covers 8 of them

Consider adding them using (in .github/workflows/spelling.yml):

      with:
        extra_dictionaries:
          cspell:fullstack/fullstack.txt
          cspell:aws/aws.txt
          cspell:rust/rust.txt
          cspell:npm/npm.txt
          cspell:java/java.txt

To stop checking additional dictionaries, add:

      with:
        check_extra_dictionaries: ''
Warnings (2)

See the 📜action log for details.

ℹ️ Warnings Count
ℹ️ deprecated-feature 1
ℹ️ limited-references 12

See ℹ️ Event descriptions for more information.

Please sign in to comment.