From gitlab at mg.gitlab.com Fri May 19 05:06:54 2023 From: gitlab at mg.gitlab.com (Matt Selsky (@selsky)) Date: Fri, 19 May 2023 05:06:54 +0000 Subject: [Git][NTPsec/ntpsec][master] Update Unity test library to 2.5.2 Message-ID: <646703ee86571_2857dc8130b4@gitlab-sidekiq-low-urgency-cpu-bound-v2-7c59697778-lrvgf.mail> Matt Selsky pushed to branch master at NTPsec / ntpsec Commits: dda4c170 by Matt Selsky at 2023-04-27T01:38:56-04:00 Update Unity test library to 2.5.2 See https://github.com/ThrowTheSwitch/Unity/releases - - - - - 3 changed files: - tests/unity/unity.c - tests/unity/unity.h - tests/unity/unity_internals.h Changes: ===================================== tests/unity/unity.c ===================================== @@ -1,6 +1,6 @@ /* ========================================================================= Unity Project - A Test Framework for C - Copyright (c) 2007-19 Mike Karlesky, Mark VanderVoord, Greg Williams + Copyright (c) 2007-21 Mike Karlesky, Mark VanderVoord, Greg Williams [Released under MIT License. Please refer to license.txt for details] ============================================================================ */ @@ -67,9 +67,10 @@ static const char PROGMEM UnityStrBreaker[] = "------------------ static const char PROGMEM UnityStrResultsTests[] = " Tests "; static const char PROGMEM UnityStrResultsFailures[] = " Failures "; static const char PROGMEM UnityStrResultsIgnored[] = " Ignored "; +#ifndef UNITY_EXCLUDE_DETAILS static const char PROGMEM UnityStrDetail1Name[] = UNITY_DETAIL1_NAME " "; static const char PROGMEM UnityStrDetail2Name[] = " " UNITY_DETAIL2_NAME " "; - +#endif /*----------------------------------------------- * Pretty Printers & Test Result Output Handlers *-----------------------------------------------*/ @@ -1001,8 +1002,7 @@ void UnityAssertFloatSpecial(const UNITY_FLOAT actual, is_trait = !isinf(actual) && !isnan(actual); break; - case UNITY_FLOAT_INVALID_TRAIT: - default: + default: /* including UNITY_FLOAT_INVALID_TRAIT */ trait_index = 0; trait_names[0] = UnityStrInvalidFloatTrait; break; @@ -1142,8 +1142,7 @@ void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual, is_trait = !isinf(actual) && !isnan(actual); break; - case UNITY_FLOAT_INVALID_TRAIT: - default: + default: /* including UNITY_FLOAT_INVALID_TRAIT */ trait_index = 0; trait_names[0] = UnityStrInvalidFloatTrait; break; ===================================== tests/unity/unity.h ===================================== @@ -1,6 +1,6 @@ /* ========================================== Unity Project - A Test Framework for C - Copyright (c) 2007-19 Mike Karlesky, Mark VanderVoord, Greg Williams + Copyright (c) 2007-21 Mike Karlesky, Mark VanderVoord, Greg Williams [Released under MIT License. Please refer to license.txt for details] ========================================== */ @@ -10,7 +10,7 @@ #define UNITY_VERSION_MAJOR 2 #define UNITY_VERSION_MINOR 5 -#define UNITY_VERSION_BUILD 1 +#define UNITY_VERSION_BUILD 2 #define UNITY_VERSION ((UNITY_VERSION_MAJOR << 16) | (UNITY_VERSION_MINOR << 8) | UNITY_VERSION_BUILD) #ifdef __cplusplus ===================================== tests/unity/unity_internals.h ===================================== @@ -1,6 +1,6 @@ /* ========================================== Unity Project - A Test Framework for C - Copyright (c) 2007-19 Mike Karlesky, Mark VanderVoord, Greg Williams + Copyright (c) 2007-21 Mike Karlesky, Mark VanderVoord, Greg Williams [Released under MIT License. Please refer to license.txt for details] ========================================== */ @@ -617,8 +617,14 @@ void UnityAssertNumbersArrayWithin(const UNITY_UINT delta, const UNITY_DISPLAY_STYLE_T style, const UNITY_FLAGS_T flags); +#ifndef UNITY_EXCLUDE_SETJMP_H void UnityFail(const char* message, const UNITY_LINE_TYPE line) UNITY_FUNCTION_ATTR(noreturn); void UnityIgnore(const char* message, const UNITY_LINE_TYPE line) UNITY_FUNCTION_ATTR(noreturn); +#else +void UnityFail(const char* message, const UNITY_LINE_TYPE line); +void UnityIgnore(const char* message, const UNITY_LINE_TYPE line); +#endif + void UnityMessage(const char* message, const UNITY_LINE_TYPE line); #ifndef UNITY_EXCLUDE_FLOAT View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/dda4c17049051fe5f89221d321d48c90cbf8f528 -- View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/dda4c17049051fe5f89221d321d48c90cbf8f528 You're receiving this email because of your account on gitlab.com. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at mg.gitlab.com Fri May 19 05:35:00 2023 From: gitlab at mg.gitlab.com (Matt Selsky (@selsky)) Date: Fri, 19 May 2023 05:35:00 +0000 Subject: [Git][NTPsec/ntpsec][master] Update macOS CI tags to use new m1 runners Message-ID: <64670a843d68a_2856810623b0@gitlab-sidekiq-low-urgency-cpu-bound-v2-7c59697778-zdjxg.mail> Matt Selsky pushed to branch master at NTPsec / ntpsec Commits: 06f98033 by Matt Selsky at 2023-05-19T01:27:03-04:00 Update macOS CI tags to use new m1 runners - - - - - 2 changed files: - .gitlab-ci.yml - .gitlab-opttest-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -381,7 +381,7 @@ macos-basic: - python ./waf uninstall - rm -rvf build/prison ./prison ../prison tags: - - shared-macos-amd64 + - saas-macos-medium-m1 rules: - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"' @@ -391,7 +391,7 @@ macos-refclocks: script: - PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage --refclock=all build || cat build/config.log tags: - - shared-macos-amd64 + - saas-macos-medium-m1 rules: - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"' ===================================== .gitlab-opttest-ci.yml ===================================== @@ -79,7 +79,7 @@ macos-options-tester: - PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig PYTHON=python2.7 tests/option-tester.sh||true - PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig PYTHON=python3 tests/option-tester.sh tags: - - shared-macos-amd64 + - saas-macos-medium-m1 rules: - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"' View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/06f9803371f992a23ee87a605db29ee0dec8a165 -- View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/06f9803371f992a23ee87a605db29ee0dec8a165 You're receiving this email because of your account on gitlab.com. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at mg.gitlab.com Fri May 19 06:00:54 2023 From: gitlab at mg.gitlab.com (Matt Selsky (@selsky)) Date: Fri, 19 May 2023 06:00:54 +0000 Subject: [Git][NTPsec/ntpsec][master] 2 commits: Remove python2.7 opttest CI target for macOS Message-ID: <6467109692c50_2857d8c853e@gitlab-sidekiq-low-urgency-cpu-bound-v2-7c59697778-j768h.mail> Matt Selsky pushed to branch master at NTPsec / ntpsec Commits: 42fd7dca by Matt Selsky at 2023-05-19T01:57:35-04:00 Remove python2.7 opttest CI target for macOS macOS no longer includes python2 in the default image - - - - - 978b769f by Matt Selsky at 2023-05-19T02:00:08-04:00 Update Homebrew pkgconfig path for new macOS image - - - - - 2 changed files: - .gitlab-ci.yml - .gitlab-opttest-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -373,7 +373,7 @@ macos-basic: <<: *job_definition image: macos-12-xcode-14 script: - - PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3" + - PKG_CONFIG_PATH=/opt/homebrew/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3" - DESTDIR=build/prison python ./waf install - DESTDIR=./prison python ./waf install - DESTDIR=../prison python ./waf install @@ -389,7 +389,7 @@ macos-refclocks: <<: *job_definition image: macos-12-xcode-14 script: - - PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage --refclock=all build || cat build/config.log + - PKG_CONFIG_PATH=/opt/homebrew/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage --refclock=all build || cat build/config.log tags: - saas-macos-medium-m1 rules: ===================================== .gitlab-opttest-ci.yml ===================================== @@ -76,8 +76,7 @@ macos-options-tester: needs: [] image: macos-12-xcode-14 script: - - PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig PYTHON=python2.7 tests/option-tester.sh||true - - PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig PYTHON=python3 tests/option-tester.sh + - PKG_CONFIG_PATH=/opt/homebrew/opt/openssl/lib/pkgconfig PYTHON=python3 tests/option-tester.sh tags: - saas-macos-medium-m1 rules: View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/06f9803371f992a23ee87a605db29ee0dec8a165...978b769f860ff194e56b641f0c967182ebb00f22 -- View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/06f9803371f992a23ee87a605db29ee0dec8a165...978b769f860ff194e56b641f0c967182ebb00f22 You're receiving this email because of your account on gitlab.com. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at mg.gitlab.com Fri May 19 06:19:15 2023 From: gitlab at mg.gitlab.com (Matt Selsky (@selsky)) Date: Fri, 19 May 2023 06:19:15 +0000 Subject: [Git][NTPsec/ntpsec][master] Add sudo to "waf install" since /usr/local isn't writable on macOS otherwise Message-ID: <646714e35ff1e_28554745587a@gitlab-sidekiq-low-urgency-cpu-bound-v2-7c59697778-ktk42.mail> Matt Selsky pushed to branch master at NTPsec / ntpsec Commits: 05d0db77 by Matt Selsky at 2023-05-19T02:18:18-04:00 Add sudo to "waf install" since /usr/local isn't writable on macOS otherwise - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -377,8 +377,8 @@ macos-basic: - DESTDIR=build/prison python ./waf install - DESTDIR=./prison python ./waf install - DESTDIR=../prison python ./waf install - - python ./waf install - - python ./waf uninstall + - sudo python ./waf install + - sudo python ./waf uninstall - rm -rvf build/prison ./prison ../prison tags: - saas-macos-medium-m1 View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/05d0db7704570e75ca196cdedd26628110f894f7 -- View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/05d0db7704570e75ca196cdedd26628110f894f7 You're receiving this email because of your account on gitlab.com. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at mg.gitlab.com Fri May 19 14:48:18 2023 From: gitlab at mg.gitlab.com (Matt Selsky (@selsky)) Date: Fri, 19 May 2023 14:48:18 +0000 Subject: [Git][NTPsec/ntpsec][master] Use variable in macOS CI jobs for Homebrew base prefix Message-ID: <64678c32c462c_2857394c20994@gitlab-sidekiq-low-urgency-cpu-bound-v2-57676c7b9d-h8grg.mail> Matt Selsky pushed to branch master at NTPsec / ntpsec Commits: 205ba274 by Matt Selsky at 2023-05-19T10:46:21-04:00 Use variable in macOS CI jobs for Homebrew base prefix - On Intel systems, homebrew uses /usr/local - On Apple Silicon, homebrew uses /opt/homebrew - - - - - 2 changed files: - .gitlab-ci.yml - .gitlab-opttest-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -373,7 +373,7 @@ macos-basic: <<: *job_definition image: macos-12-xcode-14 script: - - PKG_CONFIG_PATH=/opt/homebrew/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3" + - PKG_CONFIG_PATH=${HOMEBREW_PREFIX}/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage build --pyshebang "/usr/bin/env python3" - DESTDIR=build/prison python ./waf install - DESTDIR=./prison python ./waf install - DESTDIR=../prison python ./waf install @@ -389,7 +389,7 @@ macos-refclocks: <<: *job_definition image: macos-12-xcode-14 script: - - PKG_CONFIG_PATH=/opt/homebrew/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage --refclock=all build || cat build/config.log + - PKG_CONFIG_PATH=${HOMEBREW_PREFIX}/opt/openssl/lib/pkgconfig python ./waf configure --disable-doc --disable-manpage --refclock=all build || cat build/config.log tags: - saas-macos-medium-m1 rules: ===================================== .gitlab-opttest-ci.yml ===================================== @@ -76,7 +76,7 @@ macos-options-tester: needs: [] image: macos-12-xcode-14 script: - - PKG_CONFIG_PATH=/opt/homebrew/opt/openssl/lib/pkgconfig PYTHON=python3 tests/option-tester.sh + - PKG_CONFIG_PATH=${HOMEBREW_PREFIX}/opt/openssl/lib/pkgconfig PYTHON=python3 tests/option-tester.sh tags: - saas-macos-medium-m1 rules: View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/205ba274ceada869f99a69c61e23460ac8a5a92e -- View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/205ba274ceada869f99a69c61e23460ac8a5a92e You're receiving this email because of your account on gitlab.com. -------------- next part -------------- An HTML attachment was scrubbed... URL: