Merge branch 'main' into patch-2

timower · Apr 30, 2024 · 7c91cad · 7c91cad
2 parents dc2fd7b + 51efafc
commit 7c91cad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -18,7 +18,7 @@ jobs:
       packages: write
     strategy:
       matrix:
-        fw_version: ['2.15.1', '3.3.2', '3.5.2', '3.8.2']
+        fw_version: ['2.15.1', '3.3.2', '3.5.2', '3.8.3', '3.9.3']
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

diff --git a/Dockerfile b/Dockerfile
@@ -144,7 +144,7 @@ RUN <<EOT
     run_vm.sh -serial null -daemonize
     wait_ssh.sh
     ssh root@localhost 'while ! timedatectl status | grep "synchronized: yes"; do sleep 1; done'
-    ssh root@localhost 'wget http://toltec-dev.org/bootstrap && sed -i "s|wget_remote=http://toltec-dev.org/thirdparty/bin/wget-v1.21.1|wget_remote=https://github.com/Azathothas/Static-Binaries/raw/main/wget/wget_busybox_armv7l_abihf_musl_Linux|" bootstrap && sed -i "s|8798fcdabbe560722a02f95b30385926e4452e2c98c15c2c217583eaa0db30fc|ec215780dc74381fd5464d11b1e8efe9736f332acb237706c90720b4baa641ca|" bootstrap && bash bootstrap'
+    ssh root@localhost 'wget http://toltec-dev.org/bootstrap  && sed -i "s|wget_remote=http://toltec-dev.org/thirdparty/bin/wget-v1.21.1|wget_remote=http://toltec-dev.org/thirdparty/bin/wget-v1.21.1-1|" bootstrap && sed -i "s|8798fcdabbe560722a02f95b30385926e4452e2c98c15c2c217583eaa0db30fc|c258140f059d16d24503c62c1fdf747ca843fe4ba8fcd464a6e6bda8c3bbb6b5|" bootstrap && bash bootstrap'
     save_vm.sh
 EOT
 

diff --git a/updates.json b/updates.json
@@ -1,4 +1,8 @@
 {
+  "3.10.2.2063": "zKnOgdh8c5",
+  "3.9.4.2018":  "dg5knKZECj",
+  "3.9.3.1986":  "T1fuxwo40r",
+  "3.8.3.1976":  "M795riZ0Z8",
   "3.8.2.1965":  "D1pFxylu6p",
   "3.7.0.1930":  "XSMSQgBATy",
   "3.6.1.1894":  "T2dkdktE1H",