Fold ohttp-relay into rust-payjoin monorepo #1215
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 |
|---|---|---|
|
|
@@ -27,6 +27,15 @@ jobs: | |
| # The toolchain must be specified manually, as this action ignores the rust-toolchain override | ||
| # https://github.com/dtolnay/rust-toolchain?tab=readme-ov-file#inputs | ||
| toolchain: ${{ matrix.rust }} | ||
| - name: "Install nix" | ||
| uses: cachix/install-nix-action@v25 | ||
| with: | ||
| nix_path: nixpkgs=channel:nixos-25.11 | ||
| # This is necessary for ohttp-relay integration tests | ||
| - name: "Add nginxWithStream to PATH" | ||
| run: | | ||
| nix build .#nginx-with-stream -o nginx | ||
| echo "$(pwd)/nginx/bin" >> $GITHUB_PATH | ||
| - name: "Use cache" | ||
| uses: Swatinem/rust-cache@v2 | ||
| - name: Run tests | ||
|
|
@@ -107,6 +116,15 @@ jobs: | |
| - name: "Install toolchain" | ||
| # rust-cache usage with stable Rust is most effective, as a cache is tied to the Rust version | ||
| uses: dtolnay/rust-toolchain@stable | ||
| - name: "Install nix" | ||
| uses: cachix/install-nix-action@v25 | ||
| with: | ||
| nix_path: nixpkgs=channel:nixos-25.11 | ||
| # This is necessary for ohttp-relay integration tests | ||
|
Comment on lines
+119
to
+123
Contributor
There was a problem hiding this comment. (these are mainly notes for tomorrow's call) determinate nix installer is flake based, so no need to specify a channel: https://github.com/DeterminateSystems/nix-installer-action and we can add caching with github's caching api: https://github.com/DeterminateSystems/magic-nix-cache-action which would be very useful for nix build and nix flake check of our own stuff relatedly, we probably also want https://github.com/DeterminateSystems/flake-checker-action and https://github.com/DeterminateSystems/update-flake-lock |
||
| - name: "Add nginxWithStream to PATH" | ||
| run: | | ||
| nix build .#nginx-with-stream -o nginx | ||
| echo "$(pwd)/nginx/bin" >> $GITHUB_PATH | ||
| - name: "Use cache" | ||
| uses: Swatinem/rust-cache@v2 | ||
| - name: "Install cargo-llvm-cov" | ||
|
|
||
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.
although
-ois more stable than the usualresult, i would suggest using