- Fix windows ci workflow to install bison and flex.

diff --git a/.github/workflows/analysis_ports.yml b/.github/workflows/analysis_ports.yml
index 7c01a743211a2c553e5eba19f332f0a21e4ca8ab..59f3285aaacc3e24360489627891d49378fe2ad0 100644 (file)
--- a/.github/workflows/analysis_ports.yml
+++ b/.github/workflows/analysis_ports.yml
@@ -14,148 +14,148 @@ jobs:
     strategy:
       matrix:
         include:
-#          - name: GCC on Linux
-#            os: ubuntu-latest
-#            config: "--enable-debug --disable-flto"
-#            make_test: "yes"
-#          - name: Clang-analyzer
-#            os: ubuntu-latest
-#            config: "CC=clang --enable-debug --disable-flto --disable-static"
-#            make_test: "yes"
-#            clang_analysis: "yes"
-#          - name: libevent
-#            os: ubuntu-latest
-#            install_libevent: "yes"
-#            config: "CC=clang --enable-debug --disable-flto --with-libevent --disable-static"
-#            make_test: "yes"
-#            clang_analysis: "yes"
-#          - name: OS X
-#            os: macos-latest
-#            install_expat: "yes"
-#            config: "--enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl --with-libexpat=/usr/local/opt/expat"
-#            make_test: "yes"
-#          - name: Clang on OS X
-#            os: macos-latest
-#            install_expat: "yes"
-#            config: "CC=clang --enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl --with-libexpat=/usr/local/opt/expat --disable-static"
-#            make_test: "yes"
-#            clang_analysis: "yes"
-#          - name: ubsan (gcc undefined behaviour sanitizer)
-#            os: ubuntu-latest
-#            config: 'CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=undefined -fno-sanitize-recover=all" --disable-flto --disable-static'
-#            make_test: "yes"
-#          - name: asan (gcc address sanitizer)
-#            os: ubuntu-latest
-#            config: 'CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=address" --disable-flto --disable-static'
-#            make_test: "yes"
-#          - name: Apple iPhone on iOS, armv7
-#            os: macos-latest
-#            AUTOTOOLS_HOST: armv7-apple-ios
-#            OPENSSL_HOST: ios-cross
-#            IOS_SDK: iPhoneOS
-#            IOS_CPU: armv7s
-#            test_ios: "yes"
-#            config: "no"
-#            make: "no"
-#          - name: Apple iPhone on iOS, arm64
-#            os: macos-latest
-#            AUTOTOOLS_HOST: aarch64-apple-ios
-#            OPENSSL_HOST: ios64-cross
-#            IOS_SDK: iPhoneOS
-#            IOS_CPU: arm64
-#            test_ios: "yes"
-#            config: "no"
-#            make: "no"
-#          - name: Apple TV on iOS, arm64
-#            os: macos-latest
-#            AUTOTOOLS_HOST: aarch64-apple-ios
-#            OPENSSL_HOST: ios64-cross
-#            IOS_SDK: AppleTVOS
-#            IOS_CPU: arm64
-#            test_ios: "yes"
-#            config: "no"
-#            make: "no"
-#          - name: Apple Watch on iOS, armv7
-#            os: macos-latest
-#            AUTOTOOLS_HOST: armv7-apple-ios
-#            OPENSSL_HOST: ios-cross
-#            IOS_SDK: WatchOS
-#            IOS_CPU: armv7k
-#            test_ios: "yes"
-#            config: "no"
-#            make: "no"
-#          - name: iPhoneSimulator on OS X, i386
-#            os: macos-latest
-#            AUTOTOOLS_HOST: i386-apple-ios
-#            OPENSSL_HOST: iphoneos-cross
-#            IOS_SDK: iPhoneSimulator
-#            IOS_CPU: i386
-#            test_ios: "yes"
-#            config: "no"
-#            make: "no"
-#          - name: iPhoneSimulator on OS X, x86_64
-#            os: macos-latest
-#            AUTOTOOLS_HOST: x86_64-apple-ios
-#            OPENSSL_HOST: iphoneos-cross
-#            IOS_SDK: iPhoneSimulator
-#            IOS_CPU: x86_64
-#            test_ios: "yes"
-#            config: "no"
-#            make: "no"
-#          - name: AppleTVSimulator on OS X, x86_64
-#            os: macos-latest
-#            AUTOTOOLS_HOST: x86_64-apple-ios
-#            OPENSSL_HOST: iphoneos-cross
-#            IOS_SDK: AppleTVSimulator
-#            IOS_CPU: x86_64
-#            test_ios: "yes"
-#            config: "no"
-#            make: "no"
-#          - name: WatchSimulator on OS X, i386
-#            os: macos-latest
-#            AUTOTOOLS_HOST: i386-apple-ios
-#            OPENSSL_HOST: iphoneos-cross
-#            IOS_SDK: WatchSimulator
-#            IOS_CPU: i386
-#            test_ios: "yes"
-#            config: "no"
-#            make: "no"
-#          - name: Android armv7a
-#            os: ubuntu-latest
-#            AUTOTOOLS_HOST: armv7a-linux-androidabi
-#            OPENSSL_HOST: android-arm
-#            ANDROID_CPU: armv7a
-#            ANDROID_API: 23
-#            test_android: "yes"
-#            config: "no"
-#            make: "no"
-#          - name: Android aarch64
-#            os: ubuntu-latest
-#            AUTOTOOLS_HOST: aarch64-linux-android
-#            OPENSSL_HOST: android-arm64
-#            ANDROID_CPU: aarch64
-#            ANDROID_API: 23
-#            test_android: "yes"
-#            config: "no"
-#            make: "no"
-#          - name: Android x86
-#            os: ubuntu-latest
-#            AUTOTOOLS_HOST: i686-linux-android
-#            OPENSSL_HOST: android-x86
-#            ANDROID_CPU: x86
-#            ANDROID_API: 23
-#            test_android: "yes"
-#            config: "no"
-#            make: "no"
-#          - name: Android x86_64
-#            os: ubuntu-latest
-#            AUTOTOOLS_HOST: x86_64-linux-android
-#            OPENSSL_HOST: android-x86_64
-#            ANDROID_CPU: x86_64
-#            ANDROID_API: 23
-#            test_android: "yes"
-#            config: "no"
-#            make: "no"
+          - name: GCC on Linux
+            os: ubuntu-latest
+            config: "--enable-debug --disable-flto"
+            make_test: "yes"
+          - name: Clang-analyzer
+            os: ubuntu-latest
+            config: "CC=clang --enable-debug --disable-flto --disable-static"
+            make_test: "yes"
+            clang_analysis: "yes"
+          - name: libevent
+            os: ubuntu-latest
+            install_libevent: "yes"
+            config: "CC=clang --enable-debug --disable-flto --with-libevent --disable-static"
+            make_test: "yes"
+            clang_analysis: "yes"
+          - name: OS X
+            os: macos-latest
+            install_expat: "yes"
+            config: "--enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl --with-libexpat=/usr/local/opt/expat"
+            make_test: "yes"
+          - name: Clang on OS X
+            os: macos-latest
+            install_expat: "yes"
+            config: "CC=clang --enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl --with-libexpat=/usr/local/opt/expat --disable-static"
+            make_test: "yes"
+            clang_analysis: "yes"
+          - name: ubsan (gcc undefined behaviour sanitizer)
+            os: ubuntu-latest
+            config: 'CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=undefined -fno-sanitize-recover=all" --disable-flto --disable-static'
+            make_test: "yes"
+          - name: asan (gcc address sanitizer)
+            os: ubuntu-latest
+            config: 'CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=address" --disable-flto --disable-static'
+            make_test: "yes"
+          - name: Apple iPhone on iOS, armv7
+            os: macos-latest
+            AUTOTOOLS_HOST: armv7-apple-ios
+            OPENSSL_HOST: ios-cross
+            IOS_SDK: iPhoneOS
+            IOS_CPU: armv7s
+            test_ios: "yes"
+            config: "no"
+            make: "no"
+          - name: Apple iPhone on iOS, arm64
+            os: macos-latest
+            AUTOTOOLS_HOST: aarch64-apple-ios
+            OPENSSL_HOST: ios64-cross
+            IOS_SDK: iPhoneOS
+            IOS_CPU: arm64
+            test_ios: "yes"
+            config: "no"
+            make: "no"
+          - name: Apple TV on iOS, arm64
+            os: macos-latest
+            AUTOTOOLS_HOST: aarch64-apple-ios
+            OPENSSL_HOST: ios64-cross
+            IOS_SDK: AppleTVOS
+            IOS_CPU: arm64
+            test_ios: "yes"
+            config: "no"
+            make: "no"
+          - name: Apple Watch on iOS, armv7
+            os: macos-latest
+            AUTOTOOLS_HOST: armv7-apple-ios
+            OPENSSL_HOST: ios-cross
+            IOS_SDK: WatchOS
+            IOS_CPU: armv7k
+            test_ios: "yes"
+            config: "no"
+            make: "no"
+          - name: iPhoneSimulator on OS X, i386
+            os: macos-latest
+            AUTOTOOLS_HOST: i386-apple-ios
+            OPENSSL_HOST: iphoneos-cross
+            IOS_SDK: iPhoneSimulator
+            IOS_CPU: i386
+            test_ios: "yes"
+            config: "no"
+            make: "no"
+          - name: iPhoneSimulator on OS X, x86_64
+            os: macos-latest
+            AUTOTOOLS_HOST: x86_64-apple-ios
+            OPENSSL_HOST: iphoneos-cross
+            IOS_SDK: iPhoneSimulator
+            IOS_CPU: x86_64
+            test_ios: "yes"
+            config: "no"
+            make: "no"
+          - name: AppleTVSimulator on OS X, x86_64
+            os: macos-latest
+            AUTOTOOLS_HOST: x86_64-apple-ios
+            OPENSSL_HOST: iphoneos-cross
+            IOS_SDK: AppleTVSimulator
+            IOS_CPU: x86_64
+            test_ios: "yes"
+            config: "no"
+            make: "no"
+          - name: WatchSimulator on OS X, i386
+            os: macos-latest
+            AUTOTOOLS_HOST: i386-apple-ios
+            OPENSSL_HOST: iphoneos-cross
+            IOS_SDK: WatchSimulator
+            IOS_CPU: i386
+            test_ios: "yes"
+            config: "no"
+            make: "no"
+          - name: Android armv7a
+            os: ubuntu-latest
+            AUTOTOOLS_HOST: armv7a-linux-androidabi
+            OPENSSL_HOST: android-arm
+            ANDROID_CPU: armv7a
+            ANDROID_API: 23
+            test_android: "yes"
+            config: "no"
+            make: "no"
+          - name: Android aarch64
+            os: ubuntu-latest
+            AUTOTOOLS_HOST: aarch64-linux-android
+            OPENSSL_HOST: android-arm64
+            ANDROID_CPU: aarch64
+            ANDROID_API: 23
+            test_android: "yes"
+            config: "no"
+            make: "no"
+          - name: Android x86
+            os: ubuntu-latest
+            AUTOTOOLS_HOST: i686-linux-android
+            OPENSSL_HOST: android-x86
+            ANDROID_CPU: x86
+            ANDROID_API: 23
+            test_android: "yes"
+            config: "no"
+            make: "no"
+          - name: Android x86_64
+            os: ubuntu-latest
+            AUTOTOOLS_HOST: x86_64-linux-android
+            OPENSSL_HOST: android-x86_64
+            ANDROID_CPU: x86_64
+            ANDROID_API: 23
+            test_android: "yes"
+            config: "no"
+            make: "no"
           - name: Windows
             os: windows-latest
             test_windows: "yes"
@@ -175,18 +175,11 @@ jobs:
           cd ..
           export prepath=`pwd`
           echo prepath=${prepath}
-          echo "choco winflexbison3"
+          echo "choco install winflexbison3"
           choco install winflexbison3
-          echo "dir"
-          ls -l "C:/ProgramData/chocolatey/lib/winflexbison3/tools"
-          ls -l "C:\\ProgramData\\chocolatey\\lib\\winflexbison3\\tools"
-          echo "win_ prefixed"
-          win_flex -h
-          win_bison -h
-          echo "in chocho dir"
-          C:/ProgramData/chocolatey/bin/win_flex.exe -h
-          C:/ProgramData/chocolatey/bin/win_bison.exe -h
+          echo 'LEX="win_flex"'
           export LEX="win_flex"
+          echo 'YACC="win_bison -y"'
           export YACC="win_bison -y"
           #echo "curl cpanm"
           #curl -L -k -s -S -o cpanm https://cpanmin.us/

diff --git a/doc/Changelog b/doc/Changelog
index e61d632b3784a2fbe073fdabef021022d49dda4b..15bc43709e2cd1278ba8e184da1f16a183e50c99 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 21 August 2023: Wouter
        - Debug Windows ci workflow.
+       - Fix windows ci workflow to install bison and flex.
 
 18 August 2023: Wouter
        - Fix for iter_dec_attempts that could cause a hang, part of