update ci-scripts

switch to 7.0.7 until make issue resolved

.appveyor.yml

@@ -45,19 +45,19 @@ environment:
   - CMP: vs2019
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     PATH: C:\Python37-x64;%PATH%
-    BASE: 7.0
+    BASE: R7.0.7
   - CMP: vs2017
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     PATH: C:\Python35-x64;%PATH%
-    BASE: 7.0
+    BASE: R7.0.7
   - CMP: vs2015
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     PATH: C:\Python35-x64;%PATH%
-    BASE: 7.0
+    BASE: R7.0.7
   - CMP: gcc
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
     PATH: C:\Python35-x64;%PATH%
-    BASE: 7.0
+    BASE: R7.0.7
 
 # Platform: architecture
 platform:

.ci-local/libevent.py

@@ -58,23 +58,15 @@ if len(libevent_tag):
 
 check_call('make -C bundle libevent', shell=True, env=env)
 
-if os.environ.get('WINE')=='64':
-    print('Enable mingw64')
+for arch in os.environ.get('CI_CROSS_TARGETS', '').split(':'):
+    if not arch:
+        continue
+
+    arch, _sep, arch_ver = arch.partition('@')
+
+    print('Enable', arch, arch_ver)
+
     with open('configure/CONFIG_SITE.local', 'a') as F:
-        F.write('\nCROSS_COMPILER_TARGET_ARCHS+=windows-x64-mingw\n')
+        F.write('\nCROSS_COMPILER_TARGET_ARCHS+=%s\n'%arch)
 
-    check_call('make -C bundle libevent.windows-x64-mingw', shell=True, env=env)
-
-elif os.environ.get('WINE')=='32':
-    print('Enable mingw32')
-    with open('configure/CONFIG_SITE.local', 'a') as F:
-        F.write('\nCROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw\n')
-
-    check_call('make -C bundle libevent.win32-x86-mingw', shell=True, env=env)
-
-elif os.environ.get('RTEMS_TARGET'):
-    print('Enable RTEMS')
-    with open('configure/CONFIG_SITE.local', 'a') as F:
-        F.write('\nCROSS_COMPILER_TARGET_ARCHS+=%s\n'%os.environ['RTEMS_TARGET'])
-
-    check_call('make -C bundle libevent.'+os.environ['RTEMS_TARGET'], shell=True, env=env)
+    check_call('make -C bundle libevent.'+arch, shell=True, env=env)

.github/workflows/ci-scripts-build.yml

@@ -31,9 +31,7 @@ jobs:
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
       BASE: ${{ matrix.base }}
-      WINE: ${{ matrix.wine }}
-      RTEMS: ${{ matrix.rtems }}
-      RTEMS_TARGET: ${{ matrix.rtems_target }}
+      CI_CROSS_TARGETS: ${{ matrix.cross }}
       LIBEVENT_TAG: ${{ matrix.libevent }}
       TEST: ${{ matrix.test }}
       EXTRA: ${{ matrix.extra }}
@@ -46,7 +44,7 @@ jobs:
             os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            base: "7.0"
+            base: "R7.0.7"
             extra: "CMD_CPPFLAGS=-Werror"
             doc: 1
 
@@ -54,42 +52,41 @@ jobs:
             os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            base: "7.0"
+            base: "R7.0.7"
             extra: "CMD_CXXFLAGS=-std=c++17"
 
           - name: Cross mingw64 DLL
             os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            base: "7.0"
-            wine: "64"
+            base: "R7.0.7"
+            cross: "windows-x64-mingw"
 
           - name: Cross mingw64 static
             os: ubuntu-20.04
             cmp: gcc
             configuration: static
-            base: "7.0"
-            wine: "64"
+            base: "R7.0.7"
+            cross: "windows-x64-mingw"
 
           - name: RTEMS5
             os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            base: "7.0"
-            rtems: "5"
-            rtems_target: RTEMS-pc686-qemu
+            base: "R7.0.7"
+            cross: "RTEMS-pc686-qemu@5"
  
           - name: Native Linux with clang
             os: ubuntu-20.04
             cmp: clang
             configuration: default
-            base: "7.0"
+            base: "R7.0.7"
 
           - name: Native Linux with libevent stable
             os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            base: "7.0"
+            base: "R7.0.7"
             libevent: "release-2.0.22-stable"
 
           - name: Native Linux with 3.15
@@ -108,20 +105,20 @@ jobs:
             os: macos-latest
             cmp: clang
             configuration: default
-            base: "7.0"
+            base: "R7.0.7"
 
           - name: vs2019 DLL
             os: windows-2019
             cmp: vs2019
             configuration: debug
-            base: "7.0"
+            base: "R7.0.7"
             extra: "CMD_CXXFLAGS=-analysis"
 
           - name: vs2019 static
             os: windows-2019
             cmp: vs2019
             configuration: static-debug
-            base: "7.0"
+            base: "R7.0.7"
             extra: "CMD_CXXFLAGS=-analysis"
 
     steps:
@@ -171,7 +168,6 @@ jobs:
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
       BASE: ${{ matrix.base }}
-      WINE: ${{ matrix.wine }}
       LIBEVENT_TAG: ${{ matrix.libevent }}
       EXTRA: ${{ matrix.extra }}
       VV: "1"
@@ -183,13 +179,13 @@ jobs:
             image: centos:7
             cmp: gcc
             configuration: default
-            base: "7.0"
+            base: "R7.0.7"
 
           - name: Linux fedora 34
             image: fedora:34
             cmp: gcc
             configuration: default
-            base: "7.0"
+            base: "R7.0.7"
 
     steps:
     - name: "Build newer Git"