Skip to content
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.

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

Fix/docker build jq #1

Open
wants to merge 82 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
ab48a4f
CLI: Rename `verdi profile setdefault` to `verdi profile set-default`…
agoscinski Jun 6, 2024
3dbde9e
CLI: Remove the deprecated `verdi database` command (#6460)
sphuber Jun 6, 2024
4c11c06
CLI: Deprecate the `deprecated_command` decorator (#6461)
sphuber Jun 6, 2024
1b4a19a
Devops: Remove `verdi tui` from CLI reference documentation (#6464)
sphuber Jun 6, 2024
82bba13
Devops: Do not pin the mamba version (#6466)
danielhollas Jun 7, 2024
0812f4b
Devops: Add Dependabot config for maintaining GH actions (#6467)
danielhollas Jun 7, 2024
a56a138
CLI: Fix `verdi process [show|report|status|watch|call-root]` no output
agoscinski Jun 6, 2024
72692fa
CLI: Add `--most-recent-node` option to `verdi process watch`
agoscinski May 28, 2024
d91e0a5
CLI: Unify help of `verdi process` commands
agoscinski May 28, 2024
ccb5628
Devops: Bump the gha-dependencies group with 4 updates (#6468)
dependabot[bot] Jun 7, 2024
f553f80
CLI: Add RabbitMQ options to `verdi profile setup` (#6453)
sphuber Jun 7, 2024
202a3ec
CLI: Add the `verdi profile configure-rabbitmq` command (#6454)
sphuber Jun 7, 2024
cd0f9ac
🐛 `RabbitmqBroker`: catch `ConnectionError` for `__str__` (#6473)
mbercx Jun 18, 2024
022f049
CLI: Fix bug with profile name determination in `verdi presto` (#6477)
mbercx Jun 19, 2024
57598b1
✨ CLI: Make `NON_INTERACTIVE` option a switch instead of flag
mbercx Jun 19, 2024
aaada54
👌 CLI: Make `configure-rabbitmq` non-interactive by default
mbercx Jun 19, 2024
c2ca642
👌 CLI: Give feedback for `configure-rabbitmq`
mbercx Jun 19, 2024
6db2f40
Dependencies: Update `tabulate>=0.8.0,<0.10.0` (#6472)
sphuber Jun 24, 2024
6316099
CLI: Remove the RabbitMQ options from `verdi profile setup` (#6480)
sphuber Jun 28, 2024
8ea203c
CLI: Change `--profile` to `-p/--profile-name` for `verdi profile set…
GeigerJ2 Jun 28, 2024
56995e1
Engine: Improve error message when submitting without broker (#6465)
sphuber Jun 28, 2024
6a3a59b
Doc: Fixing several small issues (#6392)
agoscinski Jun 28, 2024
4cecda5
Devops: Disable code coverage in `test-install.yml` (#6479)
danielhollas Jun 28, 2024
a6cf7fc
Docs: Customize the color scheme through custom style sheet (#6456)
sphuber Jun 28, 2024
45a8b46
CLI: Fail early in `verdi presto` when profile name already exists (#…
sphuber Jun 28, 2024
66a2dce
CLI: Only configure logging in `set_log_level` callback once (#6493)
sphuber Jun 28, 2024
0ee0a0c
Docs: Rework the installation section (#6455)
sphuber Jun 28, 2024
737da38
Daemon: Fix `DbLogHandler` not being configured (#6491)
sphuber Jun 28, 2024
04926fe
Engine: Catch `NotImplementedError`in `get_process_state_change_times…
sphuber Jun 29, 2024
1d104d0
ORM: Cache the logger adapter for `ProcessNode` (#6492)
sphuber Jun 29, 2024
310ff1d
Docs: Clarify `Transport.copy` requires `recursive=True` if source is…
khsrali Jun 29, 2024
a44e643
Tests: Fix `tests.orm.nodes.test_node:test_delete_through_backend` (#…
sphuber Jun 30, 2024
24cfbe2
`QueryBuilder`: Remove implementation for `has_key` in SQLite storage…
sphuber Jun 30, 2024
297c3c9
Devops: Bump `docker/bake-action` from 4 to 5 (#6500)
dependabot[bot] Jul 1, 2024
61ae1a5
Dependencies: Update the requirements files (#6501)
sphuber Jul 1, 2024
076cd79
Devops: Update pre-commit step in CD workflow to match CI
sphuber Jul 1, 2024
2ccfeee
Release `v2.6.0`
sphuber Apr 17, 2024
9fe8fd2
Fixtures: Make `pgtest` truly an optional dependency (#6502)
sphuber Jul 1, 2024
9c26ce7
Release `v2.6.1`
sphuber Jul 1, 2024
14bb05f
Devops: Update pre-commit dependencies (#6504)
pre-commit-ci[bot] Jul 2, 2024
d86017f
Dependencies: Update requirements for `kiwipy` and `plumpy`
sphuber Oct 14, 2022
e913715
`Manager`: Catch `TimeoutError` when closing communicator
sphuber Jul 13, 2023
89cd03c
Docs: Fix typo in pytest plugins codeblock (#6513)
kmlefran Jul 3, 2024
11eefc9
Docs: Add `PluggableSchemaValidator` to nitpick exceptions (#6515)
sphuber Jul 4, 2024
6d2edc9
CLI: Accept mulitple node identifiers in `verdi node graph generate` …
sphuber Jul 4, 2024
f992443
Engine: Fix bug in upload calculation for `PortableCode` with SSH (#6…
sphuber Jul 5, 2024
6196dcd
`SqliteDosStorage`: Make the migrator compatible with SQLite (#6429)
sphuber Jul 5, 2024
5c1f5d6
Docs: Add `robots.txt` to only allow indexing of `latest` and `stable…
khsrali Jul 5, 2024
a3f734d
Docs: Update `redirects.txt` for installation pages (#6509)
GeigerJ2 Jul 5, 2024
c740b99
Docker: Fix release tag in publish workflow (#6520)
danielhollas Jul 5, 2024
a5da4ed
Devops: Mark `test_leak_ssh_calcjob` as nightly (#6521)
danielhollas Jul 10, 2024
9355a98
CLI: Add default for `output_file` in computer and code export comman…
GeigerJ2 Jul 10, 2024
120c8ac
CLI: Catch `NotImplementedError` in `verdi calcjob gotocomputer` (#6525)
khsrali Jul 10, 2024
9579378
Docker: Replace sleep with `s6-notifyoncheck` (#6475)
unkcpz Jul 11, 2024
cba6e7c
Dependencies: Update requirement to `psycopg~=3.0` (#6362)
sphuber Jul 11, 2024
954cbdd
`Scheduler`: Refactor interface to make it more generic (#6043)
sphuber Jul 11, 2024
2bdcb7f
Devops: Add type hints to `aiida.orm.utils.remote` (#6503)
danielhollas Jul 15, 2024
a610460
Dependencies: Pin requirement to minor version `sphinx~=7.2.0` (#6527)
sphuber Jul 16, 2024
de83e2c
`LocalTransport`: Fix typo for `ignore_nonexisting` in `put` (#6471)
MichaelGoulding Jul 17, 2024
a2063f8
CLI: Fix bug `verdi presto` when tab-completing without config (#6535)
sphuber Jul 17, 2024
17dc88c
CLI: `verdi computer test` report correct failed tests (#6536)
sphuber Jul 17, 2024
6b56d8b
Devops: Fix pymatgen import causing mypy to fail (#6540)
sphuber Jul 21, 2024
16b8fe4
Post release: add the `.post0` qualifier to version attribute
sphuber Jul 22, 2024
f1be224
Docker: Make warning test insensitive to deprecation warnings (#6541)
sphuber Jul 22, 2024
4038d55
Docs: Add succint overview of limitations of no-services profile
sphuber Jul 18, 2024
96d9fbd
Docs: Remove note in installation guide regarding Python requirement
sphuber Jul 18, 2024
d73731f
Docs: Move limitations warning to top of quick install
sphuber Jul 18, 2024
71422eb
Add the `SshAutoTransport` transport plugin (#6154)
sphuber Jul 23, 2024
5611dda
Engine: Change signature of `set_process_state_change_timestamp`
sphuber Jul 23, 2024
1b8c58b
Engine: Ignore failing process state change for `core.sqlite_dos`
sphuber Jul 23, 2024
7402c17
CLI: Fix `verdi storage migrate` for profile without broker (#6550)
sphuber Jul 25, 2024
ad1a431
CLI: Validate storage in `verdi storage version` (#6551)
sphuber Aug 5, 2024
cbf672f
Engine: Ensure node is sealed when process excepts (#6549)
sphuber Aug 6, 2024
faab95a
Docs: Correct signature of `get_daemon_client` example snippet (#6554)
khsrali Aug 6, 2024
fb36862
Post release: update version number and CHANGELOG after v2.6.2 release
sphuber Aug 7, 2024
c3b10b7
CLI: Fix exception for `verdi plugin list` (#6560)
sphuber Aug 19, 2024
c52ec67
Dependencies: Update requirement `paramiko~=3.0` (#6559)
sphuber Aug 20, 2024
655da5a
CI: Update ignore comment as the way that presumably updated mypy exp…
khsrali Sep 20, 2024
72a6b18
CLI: Add filters to verdi group delete. (#6556)
khsrali Sep 24, 2024
ab0c0ec
wip
agoscinski Sep 26, 2024
502396a
fix jq query
agoscinski Sep 27, 2024
015c550
fix typo
agoscinski Sep 27, 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
8 changes: 3 additions & 5 deletions .docker/aiida-core-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@ USER ${SYSTEM_UID}
# Pin python version here
ARG PYTHON_VERSION

# Pin mamba version here
ARG MAMBA_VERSION

# Download and install Micromamba, and initialize Conda prefix.
# <https://github.com/mamba-org/mamba#micromamba>
# Similar projects using Micromamba:
Expand Down Expand Up @@ -137,7 +134,7 @@ RUN set -x && \
--prefix="${CONDA_DIR}" \
--yes \
"${PYTHON_SPECIFIER}" \
"mamba=${MAMBA_VERSION}" && \
mamba && \
rm micromamba && \
# Pin major.minor version of python
mamba list python | grep '^python ' | tr -s ' ' | cut -d ' ' -f 1,2 >> "${CONDA_DIR}/conda-meta/pinned" && \
Expand All @@ -146,8 +143,9 @@ RUN set -x && \
fix-permissions "/home/${SYSTEM_USER}"

# Add ~/.local/bin to PATH where the dependencies get installed via pip
# This require the package installed with `--user` flag in 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

# Switch to root to install AiiDA and set AiiDA as service
# Install AiiDA from source code
Expand Down
5 changes: 0 additions & 5 deletions .docker/aiida-core-base/s6-assets/init/aiida-prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ verdi config set warnings.development_version False
# If the environment variable `SETUP_DEFAULT_AIIDA_PROFILE` is not set, set it to `true`.
if [[ ${SETUP_DEFAULT_AIIDA_PROFILE:-true} == true ]] && ! verdi profile show ${AIIDA_PROFILE_NAME} &> /dev/null; then

# For the container that includes the services, this script is called as soon as the RabbitMQ startup script has
# been launched, but it can take a while for the service to come up. If ``verdi presto`` is called straight away
# it is possible it tries to connect to the service before that and it will configure the profile without a broker.
sleep 5

# Create AiiDA profile.
verdi presto \
--verbosity info \
Expand Down
3 changes: 1 addition & 2 deletions .docker/aiida-core-with-services/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ RUN mamba install --yes \
# Install erlang.
RUN apt-get update --yes && \
apt-get install --yes --no-install-recommends \
erlang \
xz-utils && \
erlang && \
apt-get clean && rm -rf /var/lib/apt/lists/* && \
# Install rabbitmq.
wget -c --no-check-certificate https://github.com/rabbitmq/rabbitmq-server/releases/download/v${RMQ_VERSION}/rabbitmq-server-generic-unix-${RMQ_VERSION}.tar.xz && \
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/bash

rabbitmq-diagnostics ping

if [ $? -ne 0 ]; then
exit 1
fi

rabbitmq-diagnostics check_running

if [ $? -ne 0 ]; then
exit 1
fi

exit 0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3
13 changes: 11 additions & 2 deletions .docker/aiida-core-with-services/s6-assets/s6-rc.d/rabbitmq/run
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,14 @@

with-contenv

foreground { s6-echo "Calling /etc/init/rabbitmq.sh" }
rabbitmq-server
foreground { s6-echo "Starting RMQ server and notifying back when the service is ready" }


# For the container that includes the services, aiida-prepare.sh script is called as soon as the RabbitMQ startup script has
# been launched, but it can take a while for the RMQ service to come up. If ``verdi presto`` is called straight away
# it is possible it tries to connect to the service before that and it will configure the profile without a broker.
# Here we use s6-notifyoncheck to do the polling healthy check of the readyness of RMQ service.
#
# -w 500: 500 ms between two invocations of ./data/check

s6-notifyoncheck -w 500 rabbitmq-server
1 change: 0 additions & 1 deletion .docker/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ target "aiida-core-base" {
platforms = "${PLATFORMS}"
args = {
"PYTHON_VERSION" = "${PYTHON_VERSION}"
"MAMBA_VERSION" = "1.5.2"
}
}
target "aiida-core-with-services" {
Expand Down
7 changes: 5 additions & 2 deletions .docker/tests/test_aiida.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import json
import re

import pytest
from packaging.version import parse
Expand Down Expand Up @@ -32,8 +33,10 @@ def test_verdi_status(aiida_exec, container_user):
assert '✔ broker:' in output
assert 'Daemon is running' in output

# check that we have suppressed the warnings
assert 'Warning' not in output
# Check that we have suppressed the warnings coming from using an install from repo and newer RabbitMQ version.
# Make sure to match only lines that start with ``Warning:`` because otherwise deprecation warnings from other
# packages that we cannot control may fail the test.
assert not re.match('^Warning:.*', output)


def test_computer_setup_success(aiida_exec, container_user):
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/install-aiida-core/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ runs:
- name: Install uv installer
run: curl --proto '=https' --tlsv1.2 -LsSf https://${{ env.UV_URL }} | sh
env:
UV_VERSION: 0.2.5
UV_VERSION: 0.2.9
UV_URL: github.com/astral-sh/uv/releases/download/$UV_VERSION/uv-installer.sh
shell: bash

Expand Down
2 changes: 1 addition & 1 deletion .github/config/profile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ first_name: Giuseppe
last_name: Verdi
institution: Khedivial
db_backend: core.psql_dos
db_engine: postgresql_psycopg2
db_engine: postgresql_psycopg
db_host: localhost
db_port: 5432
db_name: test_aiida
Expand Down
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly
groups:
gha-dependencies:
patterns:
- '*'
15 changes: 3 additions & 12 deletions .github/workflows/ci-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- name: Create commit comment
if: failure() && steps.check_reqs.outputs.error
uses: peter-evans/commit-comment@v1
uses: peter-evans/commit-comment@v3
with:
path: pyproject.toml
body: |
Expand Down Expand Up @@ -139,17 +139,7 @@ jobs:
- name: Run test suite
env:
AIIDA_WARN_v3: 0
run: pytest -m 'presto' --cov aiida

- name: Upload coverage report
if: github.repository == 'aiidateam/aiida-core'
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
name: aiida-pytests-presto
flags: presto
file: ./coverage.xml
fail_ci_if_error: false # don't fail job, if coverage upload fails
run: pytest -m 'presto'


verdi:
Expand All @@ -165,6 +155,7 @@ jobs:
uses: ./.github/actions/install-aiida-core
with:
python-version: '3.12'
from-requirements: 'false'

- name: Run verdi tests
run: |
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
pull_request:
branches-ignore: [gh-pages]

env:
FORCE_COLOR: 1

jobs:

pre-commit:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Build images
uses: docker/bake-action@v4
uses: docker/bake-action@v5
with:
# Load to Docker engine for testing
load: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

- name: Build and upload to ghcr.io 📤
id: build
uses: docker/bake-action@v4
uses: docker/bake-action@v5
with:
push: true
workdir: .docker/
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ jobs:
vars=$(cat build.json | jq -c '[.variable | to_entries[] | {"key": .key, "value": .value.default}] | from_entries')
echo "vars=$vars" | tee -a "${GITHUB_OUTPUT}"

- id: get-version
if: ${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
run: |
tag="${{ github.ref_name }}"
echo "AIIDA_VERSION=${tag#v}" >> $GITHUB_OUTPUT

- name: Docker meta
id: meta
uses: docker/metadata-action@v5
Expand All @@ -69,7 +75,7 @@ jobs:
type=ref,event=pr
type=ref,event=branch,enable=${{ github.ref_name != 'main' }}
type=edge,enable={{is_default_branch}}
type=raw,value=aiida-${{ env.AIIDA_VERSION }},enable=${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
type=raw,value=aiida-${{ steps.get-version.outputs.AIIDA_VERSION }},enable=${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
type=raw,value=python-${{ env.PYTHON_VERSION }},enable=${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
type=raw,value=postgresql-${{ env.PGSQL_VERSION }},enable=${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
type=match,pattern=v(\d{4}\.\d{4}(-.+)?),group=1
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/docs-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
branches-ignore: [gh-pages]
paths: [docs/**]

env:
FORCE_COLOR: 1

jobs:

docs-linkcheck:
Expand Down
35 changes: 17 additions & 18 deletions .github/workflows/extract-docker-image-names.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,38 +9,35 @@ set -euo pipefail
# The input to this script is a JSON string passed via BAKE_METADATA env variable
# Here's example input (trimmed to relevant bits):
# BAKE_METADATA: {
# "base": {
# "aiida-core-base": {
# # ...
# "containerimage.descriptor": {
# "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
# "digest": "sha256:8e57a52b924b67567314b8ed3c968859cad99ea13521e60bbef40457e16f391d",
# "size": 6170,
# },
# "containerimage.digest": "sha256:8e57a52b924b67567314b8ed3c968859cad99ea13521e60bbef40457e16f391d",
# "image.name": "ghcr.io/aiidalab/base"
# },
# "aiida-core-base": {
# "image.name": "ghcr.io/aiidateam/aiida-core-base"
# "containerimage.digest": "sha256:6753a809b5b2675bf4c22408e07c1df155907a465b33c369ef93ebcb1c4fec26",
# "...": ""
# }
# "aiida-core-with-services": {
# "image.name": "ghcr.io/aiidateam/aiida-core-with-services"
# "containerimage.digest": "sha256:85ee91f61be1ea601591c785db038e5899d68d5fb89e07d66d9efbe8f352ee48",
# "...": ""
# }
# },
# "aiida-core-dev": {
# "image.name": "ghcr.io/aiidateam/aiida-core-with-services"
# "containerimage.digest": "sha256:4d9be090da287fcdf2d4658bb82f78bad791ccd15dac9af594fb8306abe47e97",
# "...": ...
# "image.name": "ghcr.io/aiidateam/aiida-core-dev"
# },
# "aiida-core-with-services": {
# "...": ""
# }
# "containerimage.digest": "sha256:85ee91f61be1ea601591c785db038e5899d68d5fb89e07d66d9efbe8f352ee48",
# "image.name": "ghcr.io/aiidateam/aiida-core-with-services"
# },
# "some-other-key": ...
# }
#
# Example output (real output is on one line):
#
# images={
# "AIIDA_CORE_BASE_IMAGE": "ghcr.io/aiidateam/aiida-core-base@sha256:8e57a52b924b67567314b8ed3c968859cad99ea13521e60bbef40457e16f391d",
# "AIIDA_CORE_WITH_SERVICES_IMAGE": "ghcr.io/aiidateam/aiida-core-with-services@sha256:6753a809b5b2675bf4c22408e07c1df155907a465b33c369ef93ebcb1c4fec26",
# "AIIDA_CORE_DEV_IMAGE": "ghcr.io/aiidateam/aiida-core-dev@sha256:85ee91f61be1ea601591c785db038e5899d68d5fb89e07d66d9efbe8f352ee48",
# "AIIDA_CORE_BASE_IMAGE": "ghcr.io/aiidateam/aiida-core-base@sha256:4c402a8bfd635650ad691674f8f29e7ddec5fa656fb425452067950415ee447f",
# "AIIDA_CORE_DEV_IMAGE": "ghcr.io/aiidateam/aiida-core-dev@sha256:f94c06e47f801e751f9829010b31532039b210aad2649d43205e16c08371b2ed",
# "AIIDA_CORE_WITH_SERVICES_IMAGE": "ghcr.io/aiidateam/aiida-core-with-services@sha256:bd8272f2a331af7eac3e83c44cc16d23b2e5f601a20ab4a865402659b758515e"
# }
#
# This json output is later turned to environment variables using fromJson() GHA builtin
Expand All @@ -52,5 +49,7 @@ if [[ -z ${BAKE_METADATA-} ]];then
exit 1
fi

images=$(echo "${BAKE_METADATA}" | jq -c '. as $base |[to_entries[] |{"key": (.key|ascii_upcase|sub("-"; "_"; "g") + "_IMAGE"), "value": [(.value."image.name"|split(",")[0]),.value."containerimage.digest"]|join("@")}] |from_entries')
images=$(echo "${BAKE_METADATA}" |
jq -c 'to_entries | map(select(.key | startswith("aiida"))) | from_entries' | # filters out every key that does not start with aiida
jq -c '. as $base |[to_entries[] |{"key": (.key|ascii_upcase|sub("-"; "_"; "g") + "_IMAGE"), "value": [(.value."image.name"|split(",")[0]),.value."containerimage.digest"]|join("@")}] |from_entries')
echo "images=$images"
11 changes: 5 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ on:
tags:
- v[0-9]+.[0-9]+.[0-9]+*

env:
FORCE_COLOR: 1

jobs:

check-release-tag:
Expand All @@ -33,17 +36,13 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Install system dependencies
# note libkrb5-dev is required as a dependency for the gssapi pip install
run: |
sudo apt update
sudo apt install libkrb5-dev ruby ruby-dev

- name: Install aiida-core and pre-commit
uses: ./.github/actions/install-aiida-core
with:
python-version: '3.10'
python-version: '3.11'
extras: '[pre-commit]'
from-requirements: 'false'

- name: Run pre-commit
run: pre-commit run --all-files || ( git status --short ; git diff ; exit 1 )
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
- uses: actions/checkout@v4

- name: Setup Conda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
channels: conda-forge

Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
- uses: actions/checkout@v4

- name: Setup Conda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
channels: conda-forge

Expand Down Expand Up @@ -229,7 +229,7 @@ jobs:
env:
AIIDA_TEST_PROFILE: test_aiida
AIIDA_WARN_v3: 1
run: pytest --cov aiida --verbose tests -m 'not nightly'
run: pytest --verbose tests -m 'not nightly'

- name: Freeze test environment
run: pip freeze | sed '1d' | tee requirements-py-${{ matrix.python-version }}.txt
Expand Down Expand Up @@ -274,7 +274,7 @@ jobs:
#
- name: Create commit comment
if: steps.check_reqs.outcome == 'Failure' # only run if requirements/ are inconsistent
uses: peter-evans/commit-comment@v1
uses: peter-evans/commit-comment@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}
path: pyproject.toml
Expand Down Expand Up @@ -306,7 +306,7 @@ jobs:
if: steps.check_reqs.outcome == 'Failure' # only run if requirements/ are inconsistent
id: create_update_requirements_pr
continue-on-error: true
uses: peter-evans/create-pull-request@v3
uses: peter-evans/create-pull-request@v6
with:
branch: update-requirements
commit-message: Automated update of requirements/ files.
Expand All @@ -324,7 +324,7 @@ jobs:

- name: Create PR comment on success
if: steps.create_update_requirements_pr.outcome == 'Success'
uses: peter-evans/create-or-update-comment@v1
uses: peter-evans/create-or-update-comment@v4
with:
issue-number: ${{ github.event.number }}
body: |
Expand All @@ -333,7 +333,7 @@ jobs:

- name: Create PR comment on failure
if: steps.create_update_requirements_pr.outcome == 'Failure'
uses: peter-evans/create-or-update-comment@v1
uses: peter-evans/create-or-update-comment@v4
with:
issue-number: ${{ github.event.number }}
body: |
Expand Down
Loading
Loading