Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lestarch: changes necessary to restrict fpp from regenerating on any … #1087

Merged
merged 5 commits into from
Nov 4, 2021

Conversation

LeStarch
Copy link
Collaborator

…loc change

Originating Project/Creator
Affected Component
Affected Architectures(s)
Related Issue(s)
Has Unit Tests (y/n)
Builds Without Errors (y/n)
Unit Tests Pass (y/n)
Documentation Included (y/n)

Change Description

This makes changing locations isolated to the fpp files affected.

@LeStarch LeStarch requested a review from bocchino October 26, 2021 01:05
@github-actions
Copy link

github-actions bot commented Oct 26, 2021

@check-spelling-bot Report

Unrecognized words, please review:

  • difflib
  • lineterm
Previously acknowledged words that are now absent acwrap bc cmak concat Connectedoutput dfdc differend eb EXTN FH Fixme followd inttype lgcov libasan libsan llx Netscape's nosetests OMG's PASSIVEC pipsetup PTLM PYTHON serialns setname setopt SQL's stdarg strcat strcpy templating tgz wget workaround
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:LeStarch/fprime.git repository
on the update/fpp-regen-restrict branch:

update_files() {
perl -e '
my @expect_files=qw('".github/actions/spelling/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/spelling/expect.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 \
  --header "Content-Type: application/json" \
  "https://api.github.com/repos/nasa/fprime/issues/comments/951464911" > "$comment_json"
comment_body=$(mktemp)
jq -r .body < "$comment_json" > $comment_body
rm $comment_json

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

patch_add=$(perl -e '$/=undef;
$_=<>;
s{<details>.*}{}s;
s{^#.*}{};
s{\n##.*}{};
s{(?:^|\n)\s*\*}{}g;
s{\s+}{ }g;
print' < "$comment_body")
  
update_files
rm $comment_body
git add -u

@lgtm-com
Copy link

lgtm-com bot commented Oct 26, 2021

This pull request introduces 1 alert when merging e8349b4 into 42a0fec - view on LGTM.com

new alerts:

  • 1 for Unused import

@github-actions
Copy link

github-actions bot commented Nov 3, 2021

@check-spelling-bot Report

Unrecognized words, please review:

  • difflib
  • lineterm
Previously acknowledged words that are now absent acwrap bc cmak concat Connectedoutput dfdc differend eb EXTN FH Fixme followd inttype lgcov libasan libsan llx Netscape's nosetests OMG's PASSIVEC pipsetup PTLM PYTHON serialns setname setopt SQL's stdarg strcat strcpy templating tgz wget workaround
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:LeStarch/fprime.git repository
on the update/fpp-regen-restrict branch:

update_files() {
perl -e '
my @expect_files=qw('".github/actions/spelling/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/spelling/expect.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 \
  --header "Content-Type: application/json" \
  "https://api.github.com/repos/nasa/fprime/issues/comments/959924453" > "$comment_json"
comment_body=$(mktemp)
jq -r .body < "$comment_json" > $comment_body
rm $comment_json

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

patch_add=$(perl -e '$/=undef;
$_=<>;
s{<details>.*}{}s;
s{^#.*}{};
s{\n##.*}{};
s{(?:^|\n)\s*\*}{}g;
s{\s+}{ }g;
print' < "$comment_body")
  
update_files
rm $comment_body
git add -u

@lgtm-com
Copy link

lgtm-com bot commented Nov 3, 2021

This pull request introduces 1 alert when merging 40b7c6a into 42a0fec - view on LGTM.com

new alerts:

  • 1 for Unused import

@LeStarch
Copy link
Collaborator Author

LeStarch commented Nov 3, 2021

@bocchino this is ready to go. Take a look would you? It should implement a working "subset FPP locs changes" pattern.

Copy link
Collaborator

@bocchino bocchino left a comment

Choose a reason for hiding this comment

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

Looks great!

I did the following:

  1. Fresh configure.
  2. Build.
  3. Go into Svc/CmdDispatcher
    a. Add a symbol and recompile
    b. Remove the symbol and recompile
    c. Comment out the Ping port in Svc/Ping/Ping.fpp
    d. Recompile and get expected missing symbol error
    e. Restore the Ping port
    f. Successfully recompile.

Behavior looks good. Performance looks good.

@lgtm-com
Copy link

lgtm-com bot commented Nov 4, 2021

This pull request introduces 1 alert when merging 2e16638 into 42a0fec - view on LGTM.com

new alerts:

  • 1 for Unused import

@LeStarch LeStarch merged commit 661234d into nasa:release/v3.0.0 Nov 4, 2021
@LeStarch LeStarch deleted the update/fpp-regen-restrict branch December 14, 2021 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants