summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam S Fulton <wsf@fultondesigns.co.uk>2021-12-05 22:24:51 +0000
committerWilliam S Fulton <wsf@fultondesigns.co.uk>2021-12-05 22:24:51 +0000
commit3947df87a20bf7d7df91b1d5b96d748692fbf34e (patch)
treea75be3549c8905b59d1a845b0471d103ff5fc8ee
parent983b91694fc9891e9c01f968cbbcdde96339434d (diff)
downloadswig-3947df87a20bf7d7df91b1d5b96d748692fbf34e.tar.gz
GHA: Test Octave 6.4
-rw-r--r--.github/workflows/ci.yml5
-rw-r--r--Tools/CI-linux-install.sh10
2 files changed, 11 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b690b829a..d328befb0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -94,6 +94,9 @@ jobs:
VER: '5.3'
- SWIGLANG: octave
CPPSTD: c++11
+ - SWIGLANG: octave
+ VER: '6.4'
+ CPPSTD: c++11
- SWIGLANG: perl5
- SWIGLANG: php
VER: '7.0'
@@ -196,8 +199,6 @@ jobs:
CPPSTD: c++11
- SWIGLANG: lua
CPPSTD: c++11
- # - SWIGLANG: octave
- # CPPSTD: c++11
- SWIGLANG: perl5
CPPSTD: c++11
- SWIGLANG: php
diff --git a/Tools/CI-linux-install.sh b/Tools/CI-linux-install.sh
index 7bd141080..1c6686d86 100644
--- a/Tools/CI-linux-install.sh
+++ b/Tools/CI-linux-install.sh
@@ -79,8 +79,14 @@ case "$SWIGLANG" in
$RETRY sudo apt-get -qq install ocaml camlp4
;;
"octave")
- $RETRY sudo apt-get -qq update
- $RETRY sudo apt-get -qq install liboctave-dev
+ if [[ "$VER" ]]; then
+ $RETRY sudo add-apt-repository -y ppa:devacom/science
+ $RETRY sudo apt-get -qq update
+ $RETRY sudo apt-get -qq install "liboctave-dev=$VER.*"
+ else
+ $RETRY sudo apt-get -qq update
+ $RETRY sudo apt-get -qq install liboctave-dev
+ fi
;;
"php")
if [[ "$VER" ]]; then