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

refactor internals, add initial gitlab support #121

Merged
merged 27 commits into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9632a3e
scripts: init add build/serve scripts for testing flakehub-push changes
colemickens Mar 27, 2024
ecbf8fb
refactor, wip, hopefully self-comments are mostly removed
colemickens Mar 27, 2024
b3e67ba
WIP: fixup compile + auto cargo fmt sorry
cole-h Apr 16, 2024
292de1d
refactor: flake_info: restore sanity checks
colemickens Apr 16, 2024
417639b
refactor: more cleanup, fixes, stash before some gitlab stuff
colemickens Apr 16, 2024
1e72c99
refactor/gitlab: stash some more notes for (p)review
colemickens Apr 16, 2024
320731d
gitlab: as much as we can seemingly get from the api
colemickens Apr 17, 2024
da0c7c3
cargo fmt
colemickens Apr 17, 2024
b1b3987
cargo fix
colemickens Apr 17, 2024
482e855
STASH AGAIN: this time cargo clippy --fix is making my code not compile
colemickens Apr 17, 2024
4b6634d
more clippy and fmt
colemickens Apr 17, 2024
dd01368
move stage conflict handling to flakehub_client
colemickens Apr 17, 2024
bb111f6
cargo clippy fix and fmt
colemickens Apr 17, 2024
13a45a2
refactor: restore github error surfacing
colemickens Apr 17, 2024
da72bdf
refactor: remove testing scripts
colemickens Apr 17, 2024
1f3e424
fake_auth: fix fakeidp jwt usage, take Url for issuer
colemickens Apr 17, 2024
1d7250a
push_context: drop unused gitlab bits
colemickens May 8, 2024
84f81af
initial feedback
colemickens May 8, 2024
6015b2a
move git_context out
colemickens May 8, 2024
2b0e573
more local token claim fixups
colemickens May 8, 2024
2c53fac
move conflict handling out of client into main
colemickens May 8, 2024
3883a6c
add ExecutionEnvironment enum
colemickens May 8, 2024
14bfd30
misc other tracing cleanups
colemickens May 8, 2024
cd781d1
drop nrgok header stuff
colemickens May 8, 2024
5fe737e
clippy compliance
colemickens May 8, 2024
a4e58e3
review comments
colemickens May 8, 2024
9b4b3f8
comment cleanup
colemickens May 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,237 changes: 888 additions & 349 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ clap = { version = "4.3.4", features = ["derive", "env"] }
color-eyre = { version = "0.6.2", default-features = false, features = [ "track-caller", "issue-url", "tracing-error", "capture-spantrace", "color-spantrace" ] }
graphql_client = { version = "0.13.0" }
tokio = { version = "1.21.0", default-features = false, features = ["time", "io-std", "process", "fs", "signal", "tracing", "rt-multi-thread", "macros", "io-util", "parking_lot" ] }
reqwest = { version = "0.11.11", default-features = false, features = ["rustls-tls-native-roots", "stream", "socks", "json"] }
reqwest = { version = "0.12.3", default-features = false, features = ["rustls-tls-native-roots", "stream", "socks", "json"] }
serde = { version = "1.0.164", features = ["derive"] }
serde_json = "1.0.97"
gix = { version = "0.62.0", features = ["async-network-client", "serde"] }
Expand All @@ -32,6 +32,8 @@ uuid = { version = "1.4.0", features = ["serde", "v7", "rand", "std"] }
semver = { version = "1.0.18", features = ["serde"] }
thiserror = "1.0.56"
url = { version = "2.5.0", features = ["serde"] }
http = "1.1.0"
gitlab = "0.1610.0"

[profile.release]
strip = true # Automatically strip symbols from the binary.
Expand Down
50 changes: 25 additions & 25 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@

nodejs_latest
nodePackages_latest.pnpm
bacon
]
++ inputs.self.packages.${system}.flakehub-push.buildInputs
++ pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ Security ]);
Expand Down
Loading
Loading