Merge branch 'main' into all-contributors/add-offbyone

airled · Sep 26, 2023 · 5c405ea · 5c405ea
2 parents e58c832 + 92f96c1
commit 5c405ea
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -2442,6 +2442,14 @@
  "contributions": [
  "infra"
  ]
+ },
+ "login": "dieterplex",
+ "name": "d1t2",
+ "avatar_url": "https://avatars.githubusercontent.com/u/507502?v=4",
+ "profile": "https://github.com/dieterplex",
+ "contributions": [
+ "infra"
+ ]
  }
  ],
  "contributorsPerLine": 8,

diff --git a/AUTHORS.md b/AUTHORS.md
@@ -345,6 +345,7 @@ authors.
   <td align="center" valign="top" width="12.5%"><a href="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/jurglic"><img src="https://avatars.githubusercontent.com/u/112600?v=4?s=100" width="100px;" alt="Jurglic"/><br /><sub><b>Jurglic</b></sub></a><br /><a href="#content-jurglic" title="Content">🖋</a></td>
   <td align="center" valign="top" width="12.5%"><a href="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/OfirLauber"><img src="https://avatars.githubusercontent.com/u/5631030?v=4?s=100" width="100px;" alt="Ofir Lauber"/><br /><sub><b>Ofir Lauber</b></sub></a><br /><a href="#content-OfirLauber" title="Content">🖋</a></td>
   <td align="center" valign="top" width="12.5%"><a href="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/offbyone"><img src="https://avatars.githubusercontent.com/u/181693?v=4?s=100" width="100px;" alt="Chris Rose"/><br /><sub><b>Chris Rose</b></sub></a><br /><a href="#infra-offbyone" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+  <td align="center" valign="top" width="12.5%"><a href="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/dieterplex"><img src="https://avatars.githubusercontent.com/u/507502?v=4?s=100" width="100px;" alt="d1t2"/><br /><sub><b>d1t2</b></sub></a><br /><a href="#infra-dieterplex" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
  </tr>
  </tbody>
 </table>

diff --git a/install.ps1 b/install.ps1
@@ -53,7 +53,7 @@ function vercomp($v1, $v2) {
 }
 
 $rustVersion = $(rustc --version).Split(" ")[1]
-$minRustVersion = "1.56"
+$minRustVersion = "1.70"
 if ((vercomp $rustVersion $minRustVersion) -eq 2) {
  Write-Host "WARNING: Rust version is too old: $rustVersion - needs at least $minRustVersion"
  Write-Host "Please update Rust with 'rustup update'"

diff --git a/install.sh b/install.sh
@@ -124,7 +124,7 @@ function vercomp() {
 }
 
 RustVersion=$(rustc --version | cut -d " " -f 2)
-MinRustVersion=1.58
+MinRustVersion=1.70
 vercomp "$RustVersion" $MinRustVersion || ec=$?
 if [ ${ec:-0} -eq 2 ]
 then