Skip to content

Commit

Permalink
Merge branch 'main' into quick-fix-benchmark-ci-fail
Browse files Browse the repository at this point in the history
  • Loading branch information
unkcpz authored Dec 5, 2024
2 parents 4230b64 + a1872b1 commit 03afe74
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .docker/aiida-core-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ENV SYSTEM_USER="${SYSTEM_USER}"

# Install all OS dependencies for notebook server that starts but lacks all
# features (e.g., download as all possible file formats)
ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update --yes && \
# - apt-get upgrade is run to patch known vulnerabilities in apt-get packages as
# the ubuntu base image is rebuilt too seldom sometimes (less than once a month)
Expand Down Expand Up @@ -145,7 +145,7 @@ RUN set -x && \
# Add ~/.local/bin to PATH where the dependencies get installed via pip
# This require the package installed with `--user` flag in pip, which we set as default.
ENV PATH=${PATH}:/home/${SYSTEM_USER}/.local/bin
ENV PIP_USER 1
ENV PIP_USER=1

# Switch to root to install AiiDA and set AiiDA as service
# Install AiiDA from source code
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,15 @@ jobs:
uses: ./.github/actions/install-aiida-core
with:
python-version: '3.11'
from-lock: 'true'

- name: Setup environment
run: .github/workflows/setup.sh
# NOTE: virtual env in .venv created by uv in previous step
run: source .venv/bin/activate && .github/workflows/setup.sh

- name: Run tests
id: tests
run: .github/workflows/tests_nightly.sh
run: source .venv/bin/activate && .github/workflows/tests_nightly.sh

- name: Slack notification
# Always run this step (otherwise it would be skipped if any of the previous steps fail) but only if the
Expand Down Expand Up @@ -101,7 +103,7 @@ jobs:
matrix:
# Currently supported RMQ versions per:
# https://www.rabbitmq.com/docs/which-erlang#compatibility-matrix
rabbitmq-version: ['3.11', '3.12', '3.13']
rabbitmq-version: ['3.11', '3.12', '3.13', '4.0']

services:
rabbitmq:
Expand All @@ -118,18 +120,19 @@ jobs:
uses: ./.github/actions/install-aiida-core
with:
python-version: '3.11'
from-lock: 'true'

- name: Setup SSH on localhost
run: .github/workflows/setup_ssh.sh
run: source .venv/bin/activate && .github/workflows/setup_ssh.sh

- name: Suppress RabbitMQ version warning
run: verdi config set warnings.rabbitmq_version False
run: uv run verdi config set warnings.rabbitmq_version False

- name: Run tests
id: tests
env:
AIIDA_WARN_v3: 0
run: pytest -s --db-backend sqlite -m 'requires_rmq' tests/
run: uv run pytest -s --db-backend sqlite -m 'requires_rmq' tests/

- name: Slack notification
# Always run this step (otherwise it would be skipped if any of the previous steps fail) but only if the
Expand Down

0 comments on commit 03afe74

Please sign in to comment.