Update Rust and Dockerfile dependencies (#1280)

Author: vlad-ivanov-name

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "hyper_cgi",
     "josh-core",

Dockerfile

@@ -1,6 +1,6 @@
-# syntax=docker/dockerfile:1.4-labs
+# syntax=docker/dockerfile:1.6-labs@sha256:bd24901c537a316a4802d920bf86605f4db8ef676ef7258a3b381e12d90c62c8
 
-ARG ALPINE_VERSION=3.17
+ARG ALPINE_VERSION=3.18
 ARG ARCH=x86_64
 
 FROM alpine:${ALPINE_VERSION} as rust-base
@@ -12,8 +12,8 @@ ENV CARGO_HOME=/usr/local/cargo
 ENV PATH=/usr/local/cargo/bin:${PATH}
 
 ARG ARCH
-ARG RUSTUP_VERSION=1.25.1
-ARG RUST_VERSION=1.66.0
+ARG RUSTUP_VERSION=1.26.0
+ARG RUST_VERSION=1.72.1
 ARG RUST_ARCH=${ARCH}-unknown-linux-musl
 
 # https://github.com/sfackler/rust-openssl/issues/1462
@@ -29,7 +29,7 @@ RUN /tmp/rustup-init \
 
 FROM rust-base as dev-planner
 
-RUN cargo install --version 0.1.51 cargo-chef
+RUN cargo install --version 0.1.62 cargo-chef
 
 WORKDIR /usr/src/josh
 COPY . .
@@ -46,7 +46,7 @@ RUN apk add --no-cache \
 
 WORKDIR /usr/src/josh
 RUN rustup component add rustfmt
-RUN cargo install --version 0.1.51 cargo-chef
+RUN cargo install --version 0.1.62 cargo-chef
 RUN cargo install --verbose --version 0.10.0 graphql_client_cli
 
 RUN apk add --no-cache \

tests/filter/ambigous_merge.t

@@ -105,7 +105,7 @@
       |-- file2
       `-- fileX
 
-  2 directories, 7 files
+  3 directories, 7 files
 
   $ git log --graph --oneline --decorate master
   *   8cbae19 (HEAD -> master) Merge branch 'hidden_branch1' into hidden_master

tests/filter/cmdline.t

@@ -72,7 +72,7 @@
   |       `-- master
   `-- tags
 
-  7 directories, 5 files
+  8 directories, 5 files
 
   $ git read-tree HEAD josh/filter/libs/master josh/filter/libs/foo
   $ git commit -m "sync"
@@ -100,7 +100,7 @@
       |-- file1
       `-- file2
 
-  3 directories, 3 files
+  4 directories, 3 files
   $ git log --graph --pretty=%s
   * sync
   * initial

tests/filter/empty_orphan.t

@@ -67,7 +67,7 @@ Empty root commits from unrelated parts of the tree should not be included
       |-- file2
       `-- file3
 
-  1 directory, 5 files
+  2 directories, 5 files
 
   $ git log master --graph --pretty=%s
   *   Merge branch 'other'

tests/filter/exclude_compose.t

@@ -31,7 +31,7 @@
   `-- sub3
       `-- file1
 
-  2 directories, 2 files
+  3 directories, 2 files
   $ git log --graph --pretty=%s
   * add file3
   * add file1
@@ -61,7 +61,7 @@
   `-- sub3
       `-- file1
 
-  1 directory, 1 file
+  2 directories, 1 file
 
   $ josh-filter -s :exclude[sub1=:/sub3] master --update refs/josh/filtered
   [1] :/sub1
@@ -88,4 +88,4 @@
   `-- sub3
       `-- file1
 
-  2 directories, 2 files
+  3 directories, 2 files

tests/filter/file.t

@@ -62,5 +62,5 @@
   |   `-- master
   `-- tags
 
-  2 directories, 1 file
+  3 directories, 1 file
 

tests/filter/hide_view.t

@@ -31,7 +31,7 @@
   `-- sub2
       `-- file3
 
-  2 directories, 3 files
+  3 directories, 3 files
 
   $ josh-filter -s c=:exclude[::sub1/] master --update refs/josh/filter/master
   [1] :prefix=c
@@ -47,7 +47,7 @@
       `-- sub2
           `-- file3
 
-  2 directories, 1 file
+  3 directories, 1 file
 
   $ josh-filter -s c=:exclude[::sub1/file2] master --update refs/josh/filter/master
   [2] :/sub1
@@ -68,7 +68,7 @@
       `-- sub2
           `-- file3
 
-  3 directories, 2 files
+  4 directories, 2 files
 
   $ josh-filter -s c=:exclude[::sub2/file3] master --update refs/josh/filter/master
   [2] :/sub1
@@ -90,4 +90,4 @@
           |-- file1
           `-- file2
 
-  2 directories, 2 files
+  3 directories, 2 files

tests/filter/reverse_hide.t

@@ -25,7 +25,7 @@
   `-- sub1
       `-- file1
 
-  1 directory, 1 file
+  2 directories, 1 file
   $ git log --graph --pretty=%s
   * add file1
 
@@ -49,7 +49,7 @@
   `-- sub2
       `-- file2
 
-  2 directories, 3 files
+  3 directories, 3 files
 
 
   $ cat sub1/file3

tests/filter/reverse_hide_edit.t

@@ -25,7 +25,7 @@
   `-- sub1
       `-- file1
 
-  1 directory, 1 file
+  2 directories, 1 file
   $ git log --graph --pretty=%s
   * add file1
 
@@ -64,5 +64,5 @@
   `-- sub2
       `-- file2
 
-  2 directories, 2 files
+  3 directories, 2 files