Merge branch 'prep-0.14.0-rc1' into rpki-team-alias

NLnetLabs · Sep 22, 2023 · e8a447a · e8a447a
2 parents 30477f6 + 00e5167
commit e8a447a
Show file tree

Hide file tree

Showing 282 changed files with 11,981 additions and 5,077 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,10 +43,10 @@ jobs:
       matrix:
         os: [ubuntu-latest]
 
-        # Test against Rust 1.63.0 because that is the oldest supported version.
+        # Test against the oldest supported version.
         # Test against beta Rust to get early warning of any problems that might occur with the upcoming Rust release.
         # Order: oldest Rust to newest Rust.
-        rust: [1.63.0, stable, beta]
+        rust: [1.65.0, stable, beta]
 
         # Test with no features, default features ("") and all except UI tests.
         # Order: fewest features to most features.
@@ -66,7 +66,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        rust: [1.63.0, stable, beta]
+        rust: [1.65.0, stable, beta]
         features: ["hsm", "hsm,hsm-tests-kmip"]
     steps:
     - name: Checkout repository
@@ -112,7 +112,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        rust: [1.63.0, stable, beta]
+        rust: [1.65.0, stable, beta]
         features: ["hsm,hsm-tests-pkcs11"]
     steps:
     - name: Checkout repository

diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@
 .idea/
 .vscode/
 .DS_Store
-data*
+data/
 krill.log
 target/
 tmp
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     .idea/
     .vscode/
     .DS_Store
-    data*
+    data/
     krill.log
     target/
     tmp
@@ Expand Down @@