Skip to content

Commit 72a542c

Browse files
authored
safeguard against missing log data in PolVeto and AnaVeto parameters (#208)
* safeguard against missing log data in PolVeto and AnaVeto parameters Signed-off-by: Jose Borreguero <borreguero@gmail.com> * fix: correct retrieval of Polarizer and Analyzer properties from metadata Signed-off-by: Jose Borreguero <borreguero@gmail.com> * chore: update conda channels and mr_reduction version in configuration files Signed-off-by: Jose Borreguero <borreguero@gmail.com> * chore: update conda channels and mr_reduction version in configuration files Signed-off-by: Jose Borreguero <borreguero@gmail.com> * fix: update conda package build process and adjust pyqt version constraint Signed-off-by: Jose Borreguero <borreguero@gmail.com> * update lockfile Signed-off-by: Jose Borreguero <borreguero@gmail.com> * fix: correct package name format in test_and_deploy.yml Signed-off-by: Jose Borreguero <borreguero@gmail.com> --------- Signed-off-by: Jose Borreguero <borreguero@gmail.com>
1 parent f85949c commit 72a542c

File tree

4 files changed

+615
-585
lines changed

4 files changed

+615
-585
lines changed

.github/workflows/test_and_deploy.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ jobs:
1717

1818
tests:
1919
runs-on: ubuntu-24.04
20+
defaults:
21+
run:
22+
shell: bash -el {0}
2023
steps:
2124
- name: Checkout
2225
uses: actions/checkout@v5
@@ -62,6 +65,9 @@ jobs:
6265

6366
build:
6467
runs-on: ubuntu-24.04
68+
defaults:
69+
run:
70+
shell: bash -el {0}
6571
steps:
6672
- name: Checkout
6773
uses: actions/checkout@v5
@@ -76,16 +82,18 @@ jobs:
7682
- name: Build conda package
7783
run: |
7884
pixi run conda-build
79-
mkdir -p /tmp/local-channel/linux-64
80-
cp *.conda /tmp/local-channel/linux-64
85+
mkdir -p /tmp/local-channel/noarch
86+
cp *.conda /tmp/local-channel/noarch/
87+
# extract version from the package file name "quicknxs-<version>-<build>.conda"
88+
echo "PKG_VERSION=$(ls *.conda | cut -d'-' -f2)" >> $GITHUB_ENV
8189
8290
- name: Verify Conda Package
8391
uses: neutrons/conda-verify@v0.1.2
8492
with:
8593
python-version: "3.11"
8694
local-channel: /tmp/local-channel
87-
package-name: ${{ env.PKG_NAME }}
88-
extra-channels: mantid-ornl mantid neutrons oncat
95+
package-name: ${{ env.PKG_NAME }}=${{ env.PKG_VERSION }} # install exact version
96+
extra-channels: neutrons mantid oncat
8997
extra-commands: |
9098
python -c "import mr_reduction"
9199
python -c "import mantid"
@@ -100,6 +108,9 @@ jobs:
100108
runs-on: ubuntu-24.04
101109
needs: [tests, build]
102110
if: startsWith(github.ref, 'refs/tags/v')
111+
defaults:
112+
run:
113+
shell: bash -el {0}
103114
steps:
104115
- name: Checkout
105116
uses: actions/checkout@v5

0 commit comments

Comments
 (0)