Skip to content

Commit 0243b89

Browse files
committed
Merge pull request #1734 from ral-facilities/release/v3.1.1
Release/v3.1.1
2 parents 571fece + 9841acf commit 0243b89

File tree

3 files changed

+135
-150
lines changed

3 files changed

+135
-150
lines changed

.github/workflows/ci-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
8989
with:
9090
repository: ral-facilities/inventory-management-system-api
91-
ref: main
91+
ref: develop
9292

9393
# This is required as need to setup api in a different directory as checkout will attempt delete
9494
# all existing files which in this case will include a data directory created by docker causing
@@ -127,13 +127,13 @@ jobs:
127127
--env OBJECT_STORAGE__API_REQUEST_TIMEOUT_SECONDS=10 \
128128
--env OBJECT_STORAGE__API_URL=http://localhost:8002 \
129129
--volume /home/runner/work/inventory-management-system/inventory-management-system-api/logging.example.ini:/app/logging.ini \
130-
harbor.stfc.ac.uk/inventory-management-system/ims-api:main
130+
harbor.stfc.ac.uk/inventory-management-system/ims-api:develop
131131
132132
- name: Clone Object Storage api repo
133133
uses: actions/checkout@0c366fd6a839edf440554fa01a7085ccba70ac98
134134
with:
135135
repository: ral-facilities/object-storage-api
136-
ref: main
136+
ref: develop
137137
path: object-storage-api
138138

139139
- name: Move Object Storage api repo
@@ -183,7 +183,7 @@ jobs:
183183
--env IMAGE__UPLOAD_LIMIT=100 \
184184
--add-host "localhost:host-gateway" \
185185
--volume /home/runner/work/inventory-management-system/object-storage-api/logging.example.ini:/app/logging.ini \
186-
harbor.stfc.ac.uk/scd-object-storage-api/object-storage-api:main
186+
harbor.stfc.ac.uk/scd-object-storage-api/object-storage-api:develop
187187
188188
- name: Checkout repo
189189
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "inventory-management-system",
3-
"version": "3.1.0",
3+
"version": "3.1.1",
44
"type": "module",
55
"private": true,
66
"dependencies": {

0 commit comments

Comments
 (0)