ci: no snooping rvd build + windows build configuration #596
Conversation
|
|
||
| steps: | ||
| - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 | ||
| - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d # v1.6.0 | ||
| - run: mkdir sshnp | ||
| - run: mkdir tarball | ||
| - if: ${{ matrix.os != 'windows-latest' }} | ||
| run: mkdir sshnp/debug | ||
| - run: dart pub get |
There was a problem hiding this comment.
did a separate mkdir instead of mkdir -p because I'm fairly confident that the powershell mkdir doesn't support that flag.
| defaultsTo: false, | ||
| help: 'Snoop on traffic passing through service', | ||
| ); | ||
| } |
There was a problem hiding this comment.
Disable the flag in the parser / usage
| @@ -43,7 +44,7 @@ class SshrvdParams { | |||
| managerAtsign: r['manager'], | |||
| ipAddress: r['ip'], | |||
| verbose: r['verbose'], | |||
| snoop: r['snoop'], | |||
| snoop: BuildEnv.enableSnoop && r['snoop'], | |||
There was a problem hiding this comment.
Block the boolean condition from trying to call r['snoop'] (which will be null since we didn't add the parser flag - see the other comment in this file)
| session, | ||
| forAtsign, | ||
| BuildEnv.enableSnoop && snoop, | ||
| ); | ||
|
|
There was a problem hiding this comment.
Disable snooping at the point of passing it to the socket connector
| - if: ${{ matrix.os != 'windows-latest' }} | ||
| run: dart compile exe bin/sshrvd.dart -v -o sshnp/sshrvd${{ matrix.ext }} | ||
| - if: ${{ matrix.os != 'windows-latest' }} | ||
| run: dart compile exe bin/sshrvd.dart -D ENABLE_SNOOP=true -v -o sshnp/debug/sshrvd${{ matrix.ext }} | ||
| - run: cp -r templates sshnp/templates |
There was a problem hiding this comment.
Disable certain binaries on windows and add their file extension
| @@ -9,7 +9,7 @@ RUN set -eux; \ | |||
| arm64) ARCH="arm64";; \ | |||
| riscv64) ARCH="riscv64";; \ | |||
| esac; \ | |||
| mkdir sshnp; \ | |||
| mkdir -p sshnp/debug; \ | |||
There was a problem hiding this comment.
mkdir -p is okay here since Dockerfile.package is linux only
There was a problem hiding this comment.
(The output folder name is hard-coded to linux in this file as well)
|
@cpswan I forgot to review the completion of the multibuild yesterday, I missed a |
|
I've verified the contents of the build, snooping is not currently disabled, however that is because we need to release the latest version of noports_core and uptake it in sshnoports |
closes #520
- What I did
rvd stuff:
ENABLE_SNOOPboolean flag to enable snooping and disabled it by defaultWindows stuff:
.exeextension to windows binaries- How I did it
- How to verify it
See https://github.com/atsign-foundation/sshnoports/actions/runs/7048957823
- Description for the changelog
ci: no snooping rvd build + windows build configuration