Merge branch 'master' into 8575dependabot/go_modules/gorm.io/driver/s…

…qlite-1.5.7
offsoc · Jan 21, 2025 · decf834 · decf834
2 parents 5d6d7d8 + ef01665
commit decf834
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@
 
 # STAGE: base
 ## Compiles Sliver for use
-FROM golang:1.22.5 AS base
+FROM golang:1.23.5 AS base
 
 ### Base packages
 RUN apt-get update --fix-missing && apt-get -y install \

diff --git a/go-assets.sh b/go-assets.sh
@@ -20,9 +20,9 @@ set -e
 
 # Creates the static go asset archives
 
-GO_VER="1.22.5"
+GO_VER="1.23.5"
 GARBLE_VER="1.22.5"
-ZIG_VER="0.13.0"
+ZIG_VER="0.14.0"
 SGN_VER="0.0.3"
 
 BLOAT_FILES="AUTHORS CONTRIBUTORS PATENTS VERSION favicon.ico robots.txt SECURITY.md CONTRIBUTING.md LICENSE README.md ./doc ./test ./api ./misc"
@@ -152,17 +152,17 @@ rm -f windows-go.zip go$GO_VER.windows-amd64.zip
 echo "-----------------------------------------------------------------"
 echo " Zig"
 echo "-----------------------------------------------------------------"
-echo "curl -L --fail --output $OUTPUT_DIR/darwin/amd64/zig https://ziglang.org/download/$ZIG_VER/zig-macos-x86_64-$ZIG_VER.tar.xz"
-curl -L --fail --output $OUTPUT_DIR/darwin/amd64/zig.tar.xz https://ziglang.org/download/$ZIG_VER/zig-macos-x86_64-$ZIG_VER.tar.xz                                                
-echo "curl -L --fail --output $OUTPUT_DIR/darwin/arm64/zig https://ziglang.org/download/$ZIG_VER/zig-macos-aarch64-$ZIG_VER.tar.xz"
-curl -L --fail --output $OUTPUT_DIR/darwin/arm64/zig.tar.xz https://ziglang.org/download/$ZIG_VER/zig-macos-aarch64-$ZIG_VER.tar.xz
-echo "curl -L --fail --output $OUTPUT_DIR/linux/amd64/zig https://ziglang.org/download/$ZIG_VER/zig-linux-x86_64-$ZIG_VER.tar.xz"
-curl -L --fail --output $OUTPUT_DIR/linux/amd64/zig.tar.xz https://ziglang.org/download/$ZIG_VER/zig-linux-x86_64-$ZIG_VER.tar.xz
-echo "curl -L --fail --output $OUTPUT_DIR/linux/arm64/zig https://ziglang.org/download/$ZIG_VER/zig-linux-aarch64-$ZIG_VER.tar.xz"
-curl -L --fail --output $OUTPUT_DIR/linux/arm64/zig.tar.xz https://ziglang.org/download/$ZIG_VER/zig-linux-aarch64-$ZIG_VER.tar.xz
+echo "curl -L --fail --output $OUTPUT_DIR/darwin/amd64/zig https://ziglang.org/builds/zig-macos-x86_64-$ZIG_VER-dev.2597+252c20310.tar.xz"
+curl -L --fail --output $OUTPUT_DIR/darwin/amd64/zig.tar.xz https://ziglang.org/builds/zig-macos-x86_64-$ZIG_VER-dev.2597+252c20310.tar.xz                                                
+echo "curl -L --fail --output $OUTPUT_DIR/darwin/arm64/zig https://ziglang.org/builds/zig-macos-aarch64-$ZIG_VER-dev.2597+252c20310.tar.xz"
+curl -L --fail --output $OUTPUT_DIR/darwin/arm64/zig.tar.xz https://ziglang.org/builds/zig-macos-aarch64-$ZIG_VER-dev.2597+252c20310.tar.xz
+echo "curl -L --fail --output $OUTPUT_DIR/linux/amd64/zig https://ziglang.org/builds/zig-linux-x86_64-$ZIG_VER-dev.2597+252c20310.tar.xz"
+curl -L --fail --output $OUTPUT_DIR/linux/amd64/zig.tar.xz https://ziglang.org/builds/zig-linux-x86_64-$ZIG_VER-dev.2597+252c20310.tar.xz
+echo "curl -L --fail --output $OUTPUT_DIR/linux/arm64/zig https://ziglang.org/builds/zig-linux-aarch64-$ZIG_VER-dev.2597+252c20310.tar.xz"
+curl -L --fail --output $OUTPUT_DIR/linux/arm64/zig.tar.xz https://ziglang.org/builds/zig-linux-aarch64-$ZIG_VER-dev.2597+252c20310.tar.xz
 # Of course Windows has to be different, because it's awful (zip file instead of a tarball)
-echo "curl -L --fail --output $OUTPUT_DIR/windows/amd64/zig.zip https://ziglang.org/download/$ZIG_VER/zig-windows-x86_64-$ZIG_VER.zip"
-curl -L --fail --output $OUTPUT_DIR/windows/amd64/zig.zip https://ziglang.org/download/$ZIG_VER/zig-windows-x86_64-$ZIG_VER.zip
+echo "curl -L --fail --output $OUTPUT_DIR/windows/amd64/zig.zip https://ziglang.org/builds/zig-windows-x86_64-$ZIG_VER-dev.2597+252c20310.zip"
+curl -L --fail --output $OUTPUT_DIR/windows/amd64/zig.zip https://ziglang.org/builds/zig-windows-x86_64-$ZIG_VER-dev.2597+252c20310.zip
 
 
 echo "-----------------------------------------------------------------"

diff --git a/go.mod b/go.mod
@@ -1,8 +1,8 @@
 module github.com/bishopfox/sliver
 
-go 1.22.0
+go 1.23.5
 
-toolchain go1.22.2
+toolchain go1.23.5
 
 replace github.com/rsteube/carapace v0.36.3 => github.com/reeflective/carapace v0.46.3-0.20231214181515-27e49f3c3b69