| 2 Dec 2022 |
Artturin | supersedes https://github.com/NixOS/ofborg/pull/615 | 20:42:21 |
cole-h | How does --force handle files that aren't affected by the checkout (i.e. dirty files, but not the ones that might prevent checking it out)? | 20:43:24 |
Artturin | -f, --force
When switching branches, proceed even if the index or the working tree differs from HEAD, and even if
there are untracked files in the way. This is used to throw away local changes and any untracked files or
directories that are in the way.
When checking out paths from the index, do not fail upon unmerged entries; instead, unmerged entries are
ignored.
| 20:43:59 |
Artturin | $ gst
forcecheckout...origin/forcecheckout
M ofborg/src/acl.rs | 1 +
M ofborg/src/clone.rs | 1 +
$ gd
ofborg/src/acl.rs
─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
────────────────────┐
8: pub struct Acl { │
────────────────────┘
8 ⋮ 8 │impl Acl {
9 ⋮ 9 │ pub fn new(repos: Vec<String>, mut trusted_users: Option<Vec<String>>) -> Acl {
10 ⋮ 10 │ if let Some(ref mut users) = trusted_users {
⋮ 11 │ aaaaaa
11 ⋮ 12 │ users.iter_mut().map(|x| *x = x.to_lowercase()).last();
12 ⋮ 13 │ }
13 ⋮ 14 │
ofborg/src/clone.rs
─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
─────────────────────────────┐
149: pub trait GitClonable { │
─────────────────────────────┘
149⋮ 149│ let result = Command::new("git")
150⋮ 150│ .arg("checkout")
151⋮ 151│ // we don't care if its dirty
⋮ 152│ // kjdsfjksf
152⋮ 153│ .arg("--force")
153⋮ 154│ .arg(git_ref)
154⋮ 155│ .current_dir(self.clone_to())
$ git checkout released --force
Found existing alias for "git checkout". You should use: "gco"
Switched to branch 'released'
Your branch is up to date with 'upstream/released'.
$ gst
released...upstream/released
Nothing to commit, working tree clean
| 20:45:05 |
Artturin | throws them away | 20:46:41 |
Artturin | this pr can be closed https://github.com/NixOS/ofborg/pull/607 | 20:50:52 |
| 3 Dec 2022 |
cole-h | In reply to @artturin:matrix.org cole-h: it's weekend again so a reminder ping https://github.com/NixOS/ofborg/pull/624 In the process of deploying a revert of this for the moment. Somehow, hyper 0.14 snuck in, which breaks things. I'll work on getting that fixed. | 21:13:36 |
Artturin | how did it break things? | 21:15:29 |
cole-h | https://gist.github.com/cole-h/ec63ba3a6c546812104c0b15acd50c06 | 21:15:58 |
cole-h | Looks like it may be as simple as enabling the tokio1 compat feature for async-std (dunno why that never made a difference in the past). Testing on eval-6 and then I'll probably just push that change to released and retry deploying all of them. | 21:52:57 |
cole-h | Yeah, that worked. Pushed and redeployed. | 22:11:29 |
| 4 Dec 2022 |
Artturin | 👍️thanks | 01:17:50 |
hexa | https://gist.github.com/GrahamcOfBorg/c21ad00a82b739fed9b29ac8471dea94 | 01:29:12 |
hexa | ofborg eval fails because nix version is too old 😄 | 01:29:19 |
hexa | in other news: 22.11 when | 01:29:27 |
Artturin | i was just making a pr | 01:29:32 |
Artturin | https://github.com/NixOS/ofborg/pull/627 | 01:29:35 |
hexa | 😄 | 01:29:42 |
hexa |
error: php74 has been dropped due to the lack of maintanence from upstream for future releases
| 01:30:10 |
hexa | have fun | 01:30:23 |
hexa | I'm going to sleep | 01:30:27 |
Artturin | pinned the php stuff to 22.05 | 01:39:43 |
Artturin | it's impossible to test php afaik | 01:40:00 |
Artturin | leaving it to grahamc (he/him) who wrote the code | 01:40:17 |
| 7 Dec 2022 |
sterni | In reply to @hexa:lossy.network ofborg eval fails because nix version is too old 😄 why do we have min bound 2.11 now?? | 15:28:11 |
Artturin | it was just a pr which would bump it | 15:28:48 |
hexa | the plan was to drop nix_2_3 so we could benefit from libarchive support through all nix versions in nixpkgs | 15:29:14 |
hexa | and arturrins plan was to clean up the unmaintained versions in between 🙂 | 15:29:43 |
hexa | * my plan was to drop nix_2_3 so we could benefit from libarchive support through all nix versions in nixpkgs | 15:29:59 |
sterni | 2.4-2.12 is like one major release, I don't feel like 2.3 is far enough away yet | 15:39:25 |