From 60f506dc17db4af642db589ea186bdcb8efae5ff Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Fri, 31 May 2024 12:03:58 +0100 Subject: [PATCH 1/4] Force gcc 13.2.0 over 13.3.0 Signed-off-by: Nigel Jones --- .github/workflows/unix.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unix.yml b/.github/workflows/unix.yml index ab0213ef3..bc8991c37 100644 --- a/.github/workflows/unix.yml +++ b/.github/workflows/unix.yml @@ -212,6 +212,8 @@ jobs: uses: actions/checkout@v4 - name: Install dependencies run: env HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja && pip3 install --break-system-packages pytest pytest-xdist pyyaml + - name: Patch GCC + run: env HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies gcc@13 && wget https://raw.githubusercontent.com/Homebrew/homebrew-core/eb6dd225d093b66054e18e07d56509cf670793b1/Formula/g/gcc%4013.rb && brew install --ignore-dependencies gcc@13.rb - name: Get system information run: sysctl -a | grep machdep.cpu - name: Configure @@ -268,4 +270,4 @@ jobs: working-directory: build - name: Run tests timeout-minutes: 60 - run: mkdir -p tmp && python3 -m pytest --verbose --ignore=tests/test_code_conventions.py --ignore=tests/test_leaks.py --ignore=tests/test_kat_all.py \ No newline at end of file + run: mkdir -p tmp && python3 -m pytest --verbose --ignore=tests/test_code_conventions.py --ignore=tests/test_leaks.py --ignore=tests/test_kat_all.py From 5399a24034369173508bd2f7942ea48412bf3ada Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Fri, 31 May 2024 12:20:10 +0100 Subject: [PATCH 2/4] remove gcc override to validate gcc change resulted in build success (and this fails) Signed-off-by: Nigel Jones --- .github/workflows/unix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unix.yml b/.github/workflows/unix.yml index bc8991c37..00f543096 100644 --- a/.github/workflows/unix.yml +++ b/.github/workflows/unix.yml @@ -212,8 +212,8 @@ jobs: uses: actions/checkout@v4 - name: Install dependencies run: env HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja && pip3 install --break-system-packages pytest pytest-xdist pyyaml - - name: Patch GCC - run: env HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies gcc@13 && wget https://raw.githubusercontent.com/Homebrew/homebrew-core/eb6dd225d093b66054e18e07d56509cf670793b1/Formula/g/gcc%4013.rb && brew install --ignore-dependencies gcc@13.rb + #- name: Patch GCC + #run: env HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies gcc@13 && wget https://raw.githubusercontent.com/Homebrew/homebrew-core/eb6dd225d093b66054e18e07d56509cf670793b1/Formula/g/gcc%4013.rb && brew install --ignore-dependencies gcc@13.rb - name: Get system information run: sysctl -a | grep machdep.cpu - name: Configure From eeed055e9fa58321a694accb8349cce20aa32308 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Fri, 31 May 2024 12:35:35 +0100 Subject: [PATCH 3/4] add back gcc override Signed-off-by: Nigel Jones --- .github/workflows/unix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unix.yml b/.github/workflows/unix.yml index 00f543096..bc8991c37 100644 --- a/.github/workflows/unix.yml +++ b/.github/workflows/unix.yml @@ -212,8 +212,8 @@ jobs: uses: actions/checkout@v4 - name: Install dependencies run: env HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja && pip3 install --break-system-packages pytest pytest-xdist pyyaml - #- name: Patch GCC - #run: env HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies gcc@13 && wget https://raw.githubusercontent.com/Homebrew/homebrew-core/eb6dd225d093b66054e18e07d56509cf670793b1/Formula/g/gcc%4013.rb && brew install --ignore-dependencies gcc@13.rb + - name: Patch GCC + run: env HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies gcc@13 && wget https://raw.githubusercontent.com/Homebrew/homebrew-core/eb6dd225d093b66054e18e07d56509cf670793b1/Formula/g/gcc%4013.rb && brew install --ignore-dependencies gcc@13.rb - name: Get system information run: sysctl -a | grep machdep.cpu - name: Configure From b68168b15e9bd8f20f302d2dd5e7a952b9b6aaa2 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Fri, 31 May 2024 13:27:26 +0100 Subject: [PATCH 4/4] ensure no autoupdate Signed-off-by: Nigel Jones --- .github/workflows/unix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unix.yml b/.github/workflows/unix.yml index bc8991c37..a916f3633 100644 --- a/.github/workflows/unix.yml +++ b/.github/workflows/unix.yml @@ -213,7 +213,7 @@ jobs: - name: Install dependencies run: env HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja && pip3 install --break-system-packages pytest pytest-xdist pyyaml - name: Patch GCC - run: env HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies gcc@13 && wget https://raw.githubusercontent.com/Homebrew/homebrew-core/eb6dd225d093b66054e18e07d56509cf670793b1/Formula/g/gcc%4013.rb && brew install --ignore-dependencies gcc@13.rb + run: env HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies gcc@13 && wget https://raw.githubusercontent.com/Homebrew/homebrew-core/eb6dd225d093b66054e18e07d56509cf670793b1/Formula/g/gcc%4013.rb && env HOMEBREW_NO_AUTO_UPDATE=1 brew install --ignore-dependencies gcc@13.rb - name: Get system information run: sysctl -a | grep machdep.cpu - name: Configure