From b4f0cd0bcb47c4759859864113edd236c6049e23 Mon Sep 17 00:00:00 2001 From: maryryan Date: Fri, 2 May 2025 16:31:20 +0000 Subject: [PATCH 1/5] update min cmake for tests --- test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 0a30144..5fd807c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.8) set(TCL_TCLSH tclsh8.6) From 88835c6fe4247de719a821da5fccab768184203a Mon Sep 17 00:00:00 2001 From: maryryan Date: Fri, 2 May 2025 17:04:15 +0000 Subject: [PATCH 2/5] force tcl8 --- .github/workflows/mac-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml index 02cde94..6ee14aa 100644 --- a/.github/workflows/mac-ci.yml +++ b/.github/workflows/mac-ci.yml @@ -16,12 +16,12 @@ jobs: - name: Install dependencies run: | brew update - brew install tcl-tk || true + brew install tcl-tk@8 || true sudo mkdir -p /usr/local - sudo ln -sf /usr/local/opt/tcl-tk/include/tcl-tk /usr/local/include/tcl8.6 - sudo install /usr/local/opt/tcl-tk/lib/libtcl* /usr/local/lib - sudo ln -sf /usr/local/opt/tcl-tk/bin/tclsh8.6 /usr/local/bin/tclsh - sudo ln -sf /usr/local/opt/tcl-tk/bin/tclsh8.6 /usr/local/bin/tclsh8.6 + sudo ln -sf /usr/local/opt/tcl-tk@8/include/tcl-tk /usr/local/include/tcl8.6 + sudo install /usr/local/opt/tcl-tk@8/lib/libtcl* /usr/local/lib + sudo ln -sf /usr/local/opt/tcl-tk@8/bin/tclsh8.6 /usr/local/bin/tclsh + sudo ln -sf /usr/local/opt/tcl-tk@8/bin/tclsh8.6 /usr/local/bin/tclsh8.6 - name: make run: make - name: install From ed08b2db30c93c21fbf068cb1835fb320d38b8ed Mon Sep 17 00:00:00 2001 From: maryryan Date: Fri, 2 May 2025 17:09:14 +0000 Subject: [PATCH 3/5] upgrade runner --- .github/workflows/linux-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index 0c13588..9c25431 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 From d4a64dde49d2b296985b06fdc60dd5d982616291 Mon Sep 17 00:00:00 2001 From: maryryan Date: Fri, 2 May 2025 17:11:48 +0000 Subject: [PATCH 4/5] upgrade gcc --- .github/workflows/linux-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index 9c25431..cb9f84c 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -17,8 +17,8 @@ jobs: run: | sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test sudo apt-get update -qq - sudo apt-get install -y gcc-7 g++-7 - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 70 --slave /usr/bin/g++ g++ /usr/bin/g++-7 + sudo apt-get install -y gcc-11 g++-11 + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 70 --slave /usr/bin/g++ g++ /usr/bin/g++-11 sudo apt-get install -y tcl8.6-dev - name: make run: make From 87e9d6d8cb344d6eab0f7e78fceed0729eb09f2c Mon Sep 17 00:00:00 2001 From: maryryan Date: Fri, 2 May 2025 17:16:31 +0000 Subject: [PATCH 5/5] remove non-working changes --- .github/workflows/mac-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml index 6ee14aa..02cde94 100644 --- a/.github/workflows/mac-ci.yml +++ b/.github/workflows/mac-ci.yml @@ -16,12 +16,12 @@ jobs: - name: Install dependencies run: | brew update - brew install tcl-tk@8 || true + brew install tcl-tk || true sudo mkdir -p /usr/local - sudo ln -sf /usr/local/opt/tcl-tk@8/include/tcl-tk /usr/local/include/tcl8.6 - sudo install /usr/local/opt/tcl-tk@8/lib/libtcl* /usr/local/lib - sudo ln -sf /usr/local/opt/tcl-tk@8/bin/tclsh8.6 /usr/local/bin/tclsh - sudo ln -sf /usr/local/opt/tcl-tk@8/bin/tclsh8.6 /usr/local/bin/tclsh8.6 + sudo ln -sf /usr/local/opt/tcl-tk/include/tcl-tk /usr/local/include/tcl8.6 + sudo install /usr/local/opt/tcl-tk/lib/libtcl* /usr/local/lib + sudo ln -sf /usr/local/opt/tcl-tk/bin/tclsh8.6 /usr/local/bin/tclsh + sudo ln -sf /usr/local/opt/tcl-tk/bin/tclsh8.6 /usr/local/bin/tclsh8.6 - name: make run: make - name: install