From c6eec978fe1a3e1a83a10b3fd10593ea253dd9ef Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Tue, 13 Dec 2022 09:05:37 -0800
Subject: [PATCH] update ci

---
 .ci-local/libevent.py                  |  4 ++--
 .github/workflows/ci-scripts-build.yml | 24 ++++++++++++------------
 .github/workflows/python.yml           |  2 +-
 MANIFEST.in                            |  1 +
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.ci-local/libevent.py b/.ci-local/libevent.py
index 4cd0085..87c887c 100644
--- a/.ci-local/libevent.py
+++ b/.ci-local/libevent.py
@@ -56,7 +56,7 @@ if len(libevent_tag):
     check_call('git reset --hard '+libevent_tag+' --',
                shell=True, cwd='bundle/libevent')
 
-check_call('make -C bundle libevent', shell=True, env=env)
+check_call('make -C bundle libevent VERBOSE=1', shell=True, env=env)
 
 for arch in os.environ.get('CI_CROSS_TARGETS', '').split(':'):
     if not arch:
@@ -69,4 +69,4 @@ for arch in os.environ.get('CI_CROSS_TARGETS', '').split(':'):
     with open('configure/CONFIG_SITE.local', 'a') as F:
         F.write('\nCROSS_COMPILER_TARGET_ARCHS+=%s\n'%arch)
 
-    check_call('make -C bundle libevent.'+arch, shell=True, env=env)
+    check_call('make -C bundle libevent.'+arch+' VERBOSE=1', shell=True, env=env)
diff --git a/.github/workflows/ci-scripts-build.yml b/.github/workflows/ci-scripts-build.yml
index 35ff8e7..b8fdb42 100644
--- a/.github/workflows/ci-scripts-build.yml
+++ b/.github/workflows/ci-scripts-build.yml
@@ -44,7 +44,7 @@ jobs:
             os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            base: "R7.0.7"
+            base: "7.0"
             extra: "CMD_CPPFLAGS=-Werror"
             doc: 1
 
@@ -52,41 +52,41 @@ jobs:
             os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            base: "R7.0.7"
+            base: "7.0"
             extra: "CMD_CXXFLAGS=-std=c++17"
 
           - name: Cross mingw64 DLL
             os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            base: "R7.0.7"
+            base: "7.0"
             cross: "windows-x64-mingw"
 
           - name: Cross mingw64 static
             os: ubuntu-20.04
             cmp: gcc
             configuration: static
-            base: "R7.0.7"
+            base: "7.0"
             cross: "windows-x64-mingw"
 
           - name: RTEMS5
             os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            base: "R7.0.7"
+            base: "7.0"
             cross: "RTEMS-pc686-qemu@5"
  
           - name: Native Linux with clang
             os: ubuntu-20.04
             cmp: clang
             configuration: default
-            base: "R7.0.7"
+            base: "7.0"
 
           - name: Native Linux with libevent stable
             os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            base: "R7.0.7"
+            base: "7.0"
             libevent: "release-2.0.22-stable"
 
           - name: Native Linux with 3.15
@@ -105,20 +105,20 @@ jobs:
             os: macos-latest
             cmp: clang
             configuration: default
-            base: "R7.0.7"
+            base: "7.0"
 
           - name: vs2019 DLL
             os: windows-2019
             cmp: vs2019
             configuration: debug
-            base: "R7.0.7"
+            base: "7.0"
             extra: "CMD_CXXFLAGS=-analysis"
 
           - name: vs2019 static
             os: windows-2019
             cmp: vs2019
             configuration: static-debug
-            base: "R7.0.7"
+            base: "7.0"
             extra: "CMD_CXXFLAGS=-analysis"
 
     steps:
@@ -179,13 +179,13 @@ jobs:
             image: centos:7
             cmp: gcc
             configuration: default
-            base: "R7.0.7"
+            base: "7.0"
 
           - name: Linux fedora 34
             image: fedora:34
             cmp: gcc
             configuration: default
-            base: "R7.0.7"
+            base: "7.0"
 
     steps:
     - name: "Build newer Git"
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index b8e8de0..fc52e72 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -30,7 +30,7 @@ jobs:
         include:
           - name: linux64 test
             os: ubuntu-latest
-            python: "3.5"
+            python: "3.9"
             source: true
 
           # OSX py builds
diff --git a/MANIFEST.in b/MANIFEST.in
index 5f83e4b..0aee4a8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -12,6 +12,7 @@ include src/pvxs/*.h@
 include src/os/default/*.cpp
 include src/os/WIN32/*.cpp
 
+include bundle/libevent/LICENSE
 include bundle/libevent/cmake/VersionViaGit.cmake
 include bundle/libevent/*.h
 include bundle/libevent/*.h.cmake