From bff5323f1744c152a8d6bfa869dec3be9b8937bf Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Thu, 24 Oct 2024 16:54:24 +0200
Subject: [PATCH] chore: fix the CI, add 2024.2 to the functional tests

---
 .github/workflows/functional.yaml | 11 ++++-------
 .github/workflows/main.yml        |  4 ++--
 src/common.rs                     |  2 +-
 src/endpointfilters.rs            |  3 ++-
 src/lib.rs                        |  2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/functional.yaml b/.github/workflows/functional.yaml
index 5f70294..bfaba58 100644
--- a/.github/workflows/functional.yaml
+++ b/.github/workflows/functional.yaml
@@ -10,18 +10,15 @@ jobs:
         openstack_version: ["master"]
         ubuntu_version: ["22.04"]
         include:
+          - name: "dolmatian"
+            openstack_version: "stable/2024.2"
+            ubuntu_version: "22.04"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
           - name: "bobcat"
             openstack_version: "stable/2023.2"
             ubuntu_version: "22.04"
-          - name: "antelope"
-            openstack_version: "stable/2023.1"
-            ubuntu_version: "22.04"
-          - name: "zed"
-            openstack_version: "stable/zed"
-            ubuntu_version: "22.04"
     runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: Deploy OpenStack ${{ matrix.name }} and run examples
     steps:
@@ -46,7 +43,7 @@ jobs:
         if: always()
       - name: Upload logs artifacts
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: functional-${{ matrix.name }}
           path: /tmp/devstack-logs/*
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ad68725..4bc7f64 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rust: [stable, nightly, 1.65.0]
+        rust: [stable, nightly, 1.71.0]
         flags:
           - ""
           - "--no-default-features"
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rust: [stable, nightly, 1.65.0]
+        rust: [stable, nightly, 1.71.0]
     steps:
     - uses: actions/checkout@v4
     - name: Install Rust
diff --git a/src/common.rs b/src/common.rs
index 317c6b2..1bac7fc 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -195,7 +195,7 @@ where
 }
 
 #[cfg(test)]
-pub mod test {
+pub(crate) mod test {
     use serde::{Deserialize, Serialize};
     use serde_json;
 
diff --git a/src/endpointfilters.rs b/src/endpointfilters.rs
index dfa9c74..d0f0142 100644
--- a/src/endpointfilters.rs
+++ b/src/endpointfilters.rs
@@ -307,13 +307,14 @@ impl EndpointFilters {
 pub mod test {
     use std::collections::hash_map::DefaultHasher;
     use std::hash::{Hash, Hasher};
+    use std::mem::size_of;
 
     use super::{InterfaceType, ValidInterfaces};
     use InterfaceType::*;
 
     #[test]
     fn test_valid_interfaces_basics() {
-        assert_eq!(std::mem::size_of::<ValidInterfaces>(), 4);
+        assert_eq!(size_of::<ValidInterfaces>(), 4);
 
         let empty = ValidInterfaces::empty();
         assert_eq!(empty.len(), 0);
diff --git a/src/lib.rs b/src/lib.rs
index b170cf1..589e30d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -32,7 +32,7 @@
 //!
 //! # Requirements
 //!
-//! This crate requires Rust 2021 edition and rustc version 1.65.0 or newer.
+//! This crate requires Rust 2021 edition and rustc version 1.71.0 or newer.
 //!
 //! OpenStack releases starting with Train are officially supported, although support for
 //! releases older than 1.5 years is best-effort and may be dropped without a prior warning