Skip to content

Commit 01e7258

Browse files
committed
Merge branch 'main' into python-3.10.11
2 parents 3fe3513 + 16159b1 commit 01e7258

File tree

6 files changed

+11
-7
lines changed

6 files changed

+11
-7
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
- name: Build and upload to ghcr.io 📤
5757
id: build-upload
58-
uses: docker/bake-action@v4
58+
uses: docker/bake-action@v5
5959
with:
6060
push: true
6161
# Using provenance to disable default attestation so it will build only desired images:

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
needs: [publish-dockerhub]
121121

122122
steps:
123-
- uses: softprops/action-gh-release@v0.1.15
123+
- uses: softprops/action-gh-release@v2.0.6
124124
name: Create release
125125
with:
126126
generate_release_notes: true

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ci:
55
repos:
66

77
- repo: https://github.com/pre-commit/pre-commit-hooks
8-
rev: v4.5.0
8+
rev: v4.6.0
99
hooks:
1010
- id: check-json
1111
- id: end-of-file-fixer
@@ -18,14 +18,14 @@ repos:
1818
args: [--preserve-quotes]
1919

2020
- repo: https://github.com/astral-sh/ruff-pre-commit
21-
rev: v0.3.5
21+
rev: v0.5.0
2222
hooks:
2323
- id: ruff-format
2424
- id: ruff
2525
args: [--fix, --exit-non-zero-on-fix, --show-fixes]
2626

2727
- repo: https://github.com/python-jsonschema/check-jsonschema
28-
rev: "0.27.3"
28+
rev: "0.28.6"
2929
hooks:
3030
- id: check-dependabot
3131
- id: check-github-workflows

bumpver.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpver]
2-
current_version = "v2024.1020"
2+
current_version = "v2024.1021"
33
version_pattern = "vYYYY.BUILD[-TAG]"
44
commit_message = "Bump version {old_version} -> {new_version}."
55
commit = true

stack/base-with-services/before-notebook.d/20_start-postgresql.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ else
2222
chmod -R g-rwxs "${PGDATA}"
2323

2424
if [[ -f ${PGDATA}/logfile ]]; then
25-
mv "${PSQL_LOGFILE}" "${PSQL_LOGFILE}.1" && gzip "${PSQL_LOGFILE}.1"
25+
rm -f "${PSQL_LOGFILE}.1.gz"
26+
mv "${PSQL_LOGFILE}" "${PSQL_LOGFILE}.1" && gzip "${PSQL_LOGFILE}.1"
2627
fi
2728
# Cleaning up the mess if PostgreSQL was not shutdown properly.
2829
rm -vf "${PGDATA}/postmaster.pid"

stack/base/before-notebook.d/40_prepare-aiida.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ load_computer('${computer_name}').set_minimum_job_poll_interval(${job_poll_inter
7474
else
7575

7676
# Migration will run for the default profile.
77+
pgrep -af 'verdi.* daemon' && echo "ERROR: AiiDA daemon is already running!" && exit 1
78+
## clean up stale PID-files -> .aiida/daemon/circus-{profile-name}.pid
79+
rm -f /home/${NB_USER}/.aiida/daemon/circus-*.pid
7780
verdi storage migrate --force
7881

7982
fi

0 commit comments

Comments
 (0)