From e490d9e5179331c370b8ab2241d3e2c6bc57ec2e Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Tue, 25 Oct 2022 19:22:34 -0700
Subject: [PATCH] CI: update drone and zinc tarballs

---
 ci/drone/drone.yml             | 18 +++++++++---------
 ci/drone/linux_script_finalize |  4 ----
 ci/zinc/drone.yml              | 14 +++++++-------
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/ci/drone/drone.yml b/ci/drone/drone.yml
index 1be912143b..00a5db3cc7 100644
--- a/ci/drone/drone.yml
+++ b/ci/drone/drone.yml
@@ -9,56 +9,56 @@ platform:
 
 steps:
 - name: build
-  image: ziglang/static-base:llvm15-aarch64-2
+  image: ziglang/static-base:llvm15-aarch64-3
   commands:
   - ./ci/drone/linux_script_build
 
 - name: behavior
   depends_on:
   - build
-  image: ziglang/static-base:llvm15-aarch64-2
+  image: ziglang/static-base:llvm15-aarch64-3
   commands:
   - ./ci/drone/test_linux_behavior
 
 - name: std_Debug
   depends_on:
   - build
-  image: ziglang/static-base:llvm15-aarch64-2
+  image: ziglang/static-base:llvm15-aarch64-3
   commands:
   - ./ci/drone/test_linux_std_Debug
 
 - name: std_ReleaseSafe
   depends_on:
   - build
-  image: ziglang/static-base:llvm15-aarch64-2
+  image: ziglang/static-base:llvm15-aarch64-3
   commands:
   - ./ci/drone/test_linux_std_ReleaseSafe
 
 - name: std_ReleaseFast
   depends_on:
   - build
-  image: ziglang/static-base:llvm15-aarch64-2
+  image: ziglang/static-base:llvm15-aarch64-3
   commands:
   - ./ci/drone/test_linux_std_ReleaseFast
 
 - name: std_ReleaseSmall
   depends_on:
   - build
-  image: ziglang/static-base:llvm15-aarch64-2
+  image: ziglang/static-base:llvm15-aarch64-3
   commands:
   - ./ci/drone/test_linux_std_ReleaseSmall
 
 - name: misc
   depends_on:
   - build
-  image: ziglang/static-base:llvm15-aarch64-2
+  image: ziglang/static-base:llvm15-aarch64-3
   commands:
   - ./ci/drone/test_linux_misc
 
 - name: cases
   depends_on:
   - build
-  image: ziglang/static-base:llvm15-aarch64-2
+  image: ziglang/static-base:llvm15-aarch64-3
   commands:
   - ./ci/drone/test_linux_cases
 
@@ -72,7 +72,7 @@ steps:
   - std_ReleaseSmall
   - misc
   - cases
-  image: ziglang/static-base:llvm15-aarch64-2
+  image: ziglang/static-base:llvm15-aarch64-3
   environment:
     SRHT_OAUTH_TOKEN:
       from_secret: SRHT_OAUTH_TOKEN
diff --git a/ci/drone/linux_script_finalize b/ci/drone/linux_script_finalize
index 43ff5f8f0e..5f021fbaa5 100755
--- a/ci/drone/linux_script_finalize
+++ b/ci/drone/linux_script_finalize
@@ -12,10 +12,6 @@ if [ -n "$DRONE_PULL_REQUEST" ]; then
   exit 0
 fi
 
-apk update
-apk add py3-pip perl-utils jq curl
-pip3 install s3cmd
-
 cd build
 
 mv ../LICENSE "$INSTALL_PREFIX/"
diff --git a/ci/zinc/drone.yml b/ci/zinc/drone.yml
index 57eadb9eee..6f48fe4c13 100644
--- a/ci/zinc/drone.yml
+++ b/ci/zinc/drone.yml
@@ -10,28 +10,28 @@ workspace:
 
 steps:
 - name: configure_git
-  image: ci/debian-amd64:11.1-11
+  image: ci/debian-amd64:11.1-12
   commands:
   - ./ci/zinc/configure_git
 
 - name: test_stage3_debug
   depends_on:
   - configure_git
-  image: ci/debian-amd64:11.1-11
+  image: ci/debian-amd64:11.1-12
   commands:
   - ./ci/zinc/linux_test_stage3_debug
 
 - name: test_stage3_release
   depends_on:
   - configure_git
-  image: ci/debian-amd64:11.1-11
+  image: ci/debian-amd64:11.1-12
   commands:
   - ./ci/zinc/linux_test_stage3_release
 
 - name: build_aarch64_macos
   depends_on:
   - test_stage3_release
-  image: ci/debian-amd64:11.1-11
+  image: ci/debian-amd64:11.1-12
   commands:
   - ./ci/zinc/build_aarch64_macos
 
@@ -44,7 +44,7 @@ steps:
       - master
     event:
       - push
-  image: ci/debian-amd64:11.1-11
+  image: ci/debian-amd64:11.1-12
   environment:
     AWS_ACCESS_KEY_ID:
       from_secret: AWS_ACCESS_KEY_ID
@@ -62,7 +62,7 @@ steps:
       - master
     event:
       - push
-  image: ci/debian-amd64:11.1-11
+  image: ci/debian-amd64:11.1-12
   environment:
     AWS_ACCESS_KEY_ID:
       from_secret: AWS_ACCESS_KEY_ID
@@ -80,7 +80,7 @@ steps:
       - master
     event:
       - push
-  image: ci/debian-amd64:11.1-11
+  image: ci/debian-amd64:11.1-12
   environment:
     SRHT_OAUTH_TOKEN:
       from_secret: SRHT_OAUTH_TOKEN