refactor: fixes install.sh lint errors and remove blobules publishing code #554
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| # This file is used to govern CI jobs for GitHub PRs | ||
| args@{ supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ], src ? builtins.fetchGit ../., ... }: | ||
| import ./ci.nix (args // { inherit supportedSystems src; }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,147 +1,49 @@ | ||
| { pkgs ? import ../nix { inherit system; } | ||
| , system ? builtins.currentSystem | ||
| , src ? builtins.fetchGit ../. | ||
| }: | ||
| let | ||
| install-template = | ||
| pkgs.runCommandNoCC "install.sh.template" { | ||
| src = pkgs.lib.gitOnlySource ../. ./install; | ||
| preferLocalBuild = true; | ||
| allowSubstitutes = false; | ||
| nativeBuildInputs = [ pkgs.shfmt pkgs.shellcheck ]; | ||
| allowedReferences = []; | ||
| } '' | ||
| echo "Running shellcheck..." | ||
| shellcheck --shell=sh $src/*.sh \ | ||
| --exclude SC2039 \ | ||
| --exclude SC2154 \ | ||
| --exclude SC2034 | ||
|
|
||
| echo "Running shfmt..." | ||
| shfmt -d -p -i 4 -ci -bn -s $src/*.sh | ||
|
|
||
| echo "Creating output..." | ||
| cat $src/*.sh > $out | ||
|
|
||
| echo "Fixing up..." | ||
| # Get rid of comments that don't start with '##' or '#!'. | ||
| sed -i " | ||
| /#!.*/p | ||
| /##.*/p | ||
| /^ *$/d | ||
| /^ *#/d | ||
| s/ *#.*// | ||
| " $out | ||
| ''; | ||
| in | ||
| pkgs.lib.linuxOnly ( | ||
| pkgs.runCommandNoCC "install.sh" { | ||
| # `revision` will be printed by `install.sh` as follows: | ||
| # | ||
| # log "Executing DFINITY SDK install script, commit: @revision@" | ||
| revision = src.rev; | ||
| preferLocalBuild = true; | ||
| allowSubstitutes = false; | ||
| } '' | ||
| # we stamp the file with the revision | ||
| substitute "${install-template}" $out --subst-var revision | ||
| '' | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,19 +12,20 @@ DFX_BOOL_FLAGS="" | |
| # $2 - A description of the flag. This is not currently used but will be when we have enough | ||
| # flags to implement help. | ||
| define_flag_BOOL() { | ||
| local VARNAME | ||
| VARNAME="flag_$(echo "$1" | tr /a-z/ /A-Z)" | ||
| eval "$VARNAME=\${$VARNAME:-}" | ||
| DFX_BOOL_FLAGS="${DFX_BOOL_FLAGS}--${1} $VARNAME $2" | ||
| } | ||
|
|
||
| # Get the flag name of a line in the flag description. | ||
| get_flag_name() { | ||
| echo "$1" | ||
| } | ||
|
|
||
| # Get the variable name of a line in the flag description. | ||
| get_var_name() { | ||
| echo "$2" | ||
| } | ||
|
|
||
| # Read all the command line flags and set the flag_XXXX environment variables. | ||
|
|
@@ -35,6 +36,8 @@ get_var_name() { | |
| # Environment variables are set according to flags defined and flags. | ||
| read_flags() { | ||
| # Set values from command line. | ||
| # shellcheck disable=SC2199 | ||
| # https://github.com/koalaman/shellcheck/wiki/SC2199 | ||
|
Contributor
Author
There was a problem hiding this comment. @knl do I understand correctly and is the above URL saying I should rewrite the below for ARG in "$@"; do?
Contributor
There was a problem hiding this comment. Yes. Written this way implies there will be only a single iteration of |
||
| while [[ "$@" ]]; do | ||
| local ARG=$1 | ||
| shift | ||
|
|
@@ -45,11 +48,11 @@ read_flags() { | |
| [ "$line" ] || break | ||
|
|
||
| IFS="$OLD_IFS" | ||
| FLAG="$(get_flag_name "$line")" | ||
| VARNAME="$(get_var_name "$line")" | ||
|
|
||
| if [ "$ARG" == "$FLAG" ]; then | ||
| eval "$VARNAME=1" | ||
| fi | ||
| done | ||
| done | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note: we may re-introduce
isMasterin the future for longer-running testsUh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know, but let's add it back when we need it again. That way we'll only add it where we need it. Now it's passed all over the place.