Skip to content

Commit 84fb9bd

Browse files
committed
Updated names of CI workflow steps; removed ISPYB_CREDENTIALS variable from CI workflow
1 parent 30e0e9f commit 84fb9bd

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141

4242
steps:
4343
- uses: actions/checkout@v4
44+
4445
- name: Use Python ${{ matrix.python-version }}
4546
uses: actions/setup-python@v5
4647
with:
@@ -67,13 +68,13 @@ jobs:
6768
docker run --detach --name rabbitmq -p 127.0.0.1:5672:5672 -p 127.0.0.1:15672:15672 test-rabbitmq
6869
docker container list -a
6970
70-
- name: Get ispyb database
71+
- name: Get ISPyB database
7172
uses: actions/download-artifact@v4
7273
with:
7374
name: database
7475
path: database/
7576

76-
- name: Install package
77+
- name: Install Murfey
7778
run: |
7879
set -eux
7980
pip install --disable-pip-version-check -e "."[cicd,client,server,developer]
@@ -84,7 +85,7 @@ jobs:
8485
mysql-version: "11.3"
8586
auto-start: false
8687

87-
- name: Set up test ipsyb database
88+
- name: Set up test ISPyB database
8889
run: |
8990
set -eu
9091
cp ".github/workflows/config/my.cnf" .my.cnf
@@ -102,12 +103,13 @@ jobs:
102103
grants/ispyb_processing.sql \
103104
grants/ispyb_import.sql; do
104105
105-
echo "Patching ${f} to fix CLI escape issues..."
106+
echo "Patching ${f} in SQL files to fix CLI escape issues..."
106107
sed -i 's/\\-/-/g' "$f"
107108
108-
echo Importing ${f}...
109+
echo "Importing ${f}..."
109110
mariadb --defaults-file=.my.cnf < $f
110111
done
112+
111113
mariadb --defaults-file=.my.cnf -e "CREATE USER ispyb_api@'%' IDENTIFIED BY 'password_1234'; GRANT ispyb_processing to ispyb_api@'%'; GRANT ispyb_import to ispyb_api@'%'; SET DEFAULT ROLE ispyb_processing FOR ispyb_api@'%';"
112114
mariadb --defaults-file=.my.cnf -e "CREATE USER ispyb_api_future@'%' IDENTIFIED BY 'password_4321'; GRANT SELECT ON ispybtest.* to ispyb_api_future@'%';"
113115
mariadb --defaults-file=.my.cnf -e "CREATE USER ispyb_api_sqlalchemy@'%' IDENTIFIED BY 'password_5678'; GRANT SELECT ON ispybtest.* to ispyb_api_sqlalchemy@'%'; GRANT INSERT ON ispybtest.* to ispyb_api_sqlalchemy@'%'; GRANT UPDATE ON ispybtest.* to ispyb_api_sqlalchemy@'%';"
@@ -116,18 +118,17 @@ jobs:
116118
- name: Check RabbitMQ is alive
117119
run: wget -t 10 -w 1 http://127.0.0.1:15672 -O -
118120

119-
- name: Run tests
121+
- name: Run Murfey tests
120122
env:
121123
POSTGRES_HOST: localhost
122124
POSTGRES_PORT: 5432
123125
POSTGRES_DB: murfey_test_db
124126
POSTGRES_PASSWORD: psql_pwd
125127
POSTGRES_USER: psql_user
126128
run: |
127-
export ISPYB_CREDENTIALS=".github/workflows/config/ispyb.cfg"
128129
PYTHONDEVMODE=1 pytest -v -ra --cov=murfey --cov-report=xml --cov-branch
129130
130-
- name: Upload to Codecov
131+
- name: Upload test results to Codecov
131132
uses: codecov/codecov-action@v5
132133
with:
133134
name: ${{ matrix.python-version }}

0 commit comments

Comments
 (0)