FTY remerge from master as of 20251125 #3200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

jimklimov merged 898 commits into networkupstools:FTY from jimklimov:FTY-remerge-20251125

Nov 30, 2025

Merged

FTY remerge from master as of 20251125 #3200

Filter by extension

.circleci/config.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -18,7 +18,7 @@ jobs:
  
          XCODE_VER:

            type: string

            # https://circleci.com/docs/using-macos/#supported-xcode-versions-silicon

            default: "13.4.1"

            default: "16.4"

          CC:

            type: string

            default: "" # e.g. "clang"

    @@ -73,7 +73,10 @@ jobs:
  
        # Add steps to the job

        # See: https://circleci.com/docs/2.0/configuration-reference/#steps

        steps:

          - checkout

          - checkout:

              # https://circleci.com/changelog/default-method-used-to-checkout-code-from-your-repository-is-changing-on-nov/

              # NUT SEMVER and ChangeLog work, maybe more, rely on git history

              method: full

    #      - run:

    #          name: "check shell"

    @@ -160,16 +163,16 @@ jobs:
  
          # uses of sem_init() and sem_destroy() in nut-scanner.c)

          # NOTE: CANBUILD_NIT_TESTS=yes to check if single-executor environments

          # do not have a problem with it.

          # NOTE: python3.11 is available but broken on some of the workers

          # (no homebrew dirs in search path)

          # NOTE: python3.11 was available but broken on some of the xcode-13.4.1

          # workers (no homebrew dirs in search path)

          - run:

              name: "ci_build"

              command: |-

                HOMEBREW_PREFIX="`brew config | grep HOMEBREW_PREFIX: | awk '{print $2}'`" \

                CANBUILD_NIT_TESTS=yes \

                CANBUILD_NIT_TESTS=yes DEBUG_NIT=true \

                CFLAGS="$CC_STDVER" \

                CXXFLAGS="$CXX_STDVER" \

                PYTHON=python3.11 \

                PYTHON=python3.13 \

                ./ci_build.sh

          - run:

    @@ -219,15 +222,15 @@ workflows:
  
    ### This scenario is a subset of fightwarn-all below (modulo C standard),

    ### so disabled to not waste time from free CircleCI allowance limit:

    #      - osx-xcode:

    #          name: "gnu17-clang-xcode13_4_1-default-all-errors"

    #          XCODE_VER: "13.4.1"

    #          name: "gnu17-clang-xcode16_4-default-all-errors"

    #          XCODE_VER: "16.4"

    #          CC: "clang"

    #          CXX: "clang++"

    #          CC_STDVER: "-std=gnu17"

    #          CXX_STDVER: "-std=gnu++17"

    #      - osx-xcode:

    #          name: "gnu11-gcc-xcode13_4_1-out-of-tree"

    #          name: "gnu11-gcc-xcode16_4-out-of-tree"

    #          CC: "gcc"

    #          CXX: "g++"

    #          CC_STDVER: "-std=gnu11"

    @@ -236,7 +239,7 @@ workflows:
  
    #          CI_BUILDDIR: "obj"

    #      - osx-xcode:

    #          name: "c99-cxx11-gcc-xcode13_4_1-default-distcheck"

    #          name: "c99-cxx11-gcc-xcode16_4-default-distcheck"

    #          CC: "gcc"

    #          CXX: "g++"

    #          CC_STDVER: "-std=c99"

    @@ -245,7 +248,7 @@ workflows:
  
    #          BUILD_TYPE: "default"

          - osx-xcode:

              name: "gnu11-clang-xcode13_4_1-out-of-tree"

              name: "gnu11-clang-xcode16_4-out-of-tree"

              CC: "clang"

              CXX: "clang++"

              CPP: "clang -E"

    @@ -255,7 +258,7 @@ workflows:
  
              CI_BUILDDIR: "obj"

          - osx-xcode:

              name: "c99-cxx11-clang-xcode13_4_1-default-distcheck"

              name: "c99-cxx11-clang-xcode16_4-default-distcheck"

              CC: "clang"

              CXX: "clang++"

              CPP: "clang -E"

    @@ -265,16 +268,16 @@ workflows:
  
              BUILD_TYPE: "default"

          - osx-xcode:

              name: "stdDefault-xcode13_4_1-fightwarn-all"

              name: "stdDefault-xcode16_4-fightwarn-all"

              # Run "default-all-errors" with both compiler families,

              # using their default C/C++ standard for current release:

              BUILD_TYPE: "fightwarn-all"

    ### This does not work due to missing dependencies built for MacOS in homebrew:

    ### TODO? Evaluate other packagers (MacPorts, fink...)?

    #      - osx-xcode:

    #          name: "c17-clang-xcode13_4_1-alldrv"

    #          XCODE_VER: "13.4.1"

    #          name: "c17-clang-xcode16_4-alldrv"

    #          XCODE_VER: "16.4"

    #          CC: "clang"

    #          CXX: "clang++"

    #          CC_STDVER: "-std=c17"

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

FTY remerge from master as of 20251125 #3200

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!