Skip to content

Updated to 'Armadillo 4.11.1' #549

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.

Sign up for GitHub

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
StuartWheater merged 4 commits into from
Nov 3, 2024
Merged

Updated to 'Armadillo 4.11.1' #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1fcfca
Updated to 'Armadillo 4.11.0'
StuartWheater Oct 21, 2024
5c27fed
Merge branch 'v6.3.1-RC4-dev' of github.com:StuartWheater/dsBaseClien…
StuartWheater Oct 21, 2024
520e833
Updated to Armadillo 4.11.1
StuartWheater Oct 24, 2024
6289fee
Update package deployment
StuartWheater Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- job: build_and_run_tests
timeoutInMinutes: 360
pool:
vmImage: ubuntu-22.04
vmImage: ubuntu-24.04

steps:
#####################################################################################
Expand Down Expand Up @@ -125,16 +125,11 @@ jobs:
# Install R and all the dependencies dsBaseClient requires.
# If previous steps have failed then don't run.
- bash: |

sudo apt update -qq
sudo apt install --no-install-recommends software-properties-common dirmngr
sudo apt-get install --no-install-recommends software-properties-common dirmngr
wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | sudo tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc
sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/"

# sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9
# sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu focal-cran40/"
# sudo add-apt-repository ppa:cran/libgit2
sudo apt-get update
sudo apt-get update -qq
sudo apt-get upgrade -y

sudo apt-get install -qq libxml2-dev libcurl4-openssl-dev libssl-dev libgsl-dev libgit2-dev r-base -y
sudo apt-get install -qq libharfbuzz-dev libfribidi-dev libmagick++-dev -y
Expand Down
2 changes: 1 addition & 1 deletion docker-compose_armadillo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
hostname: armadillo
ports:
- 8080:8080
image: datashield/armadillo_citest:4.10.0
image: datashield/armadillo_citest:4.11.1
environment:
LOGGING_CONFIG: 'classpath:logback-file.xml'
AUDIT_LOG_PATH: '/app/logs/audit.log'
Expand Down
5 changes: 2 additions & 3 deletions opal_azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- job: build_and_run_tests
timeoutInMinutes: 360
pool:
vmImage: ubuntu-22.04
vmImage: ubuntu-24.04

steps:
#####################################################################################
Expand Down Expand Up @@ -125,11 +125,10 @@ jobs:
# Install R and all the dependencies dsBaseClient requires.
# If previous steps have failed then don't run.
- bash: |

sudo apt-get update
sudo apt-get install --no-install-recommends software-properties-common dirmngr
wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | sudo tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc
sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/"
sudo apt-get update -qq
sudo apt-get upgrade -y

sudo apt-get install -qq libxml2-dev libcurl4-openssl-dev libssl-dev libgsl-dev libgit2-dev r-base -y
Expand Down