Skip to content

Commit 99246e1

Browse files
authored
Merge branch 'development' into fix/table-not-found
2 parents ff09108 + 1ccf10a commit 99246e1

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
run: |
9494
tar czvf coatjava.tar.gz coatjava
9595
tar czvf clara.tar.gz clara
96-
- uses: actions/upload-artifact@v6
96+
- uses: actions/upload-artifact@v7
9797
with:
9898
name: build_${{ matrix.runner }}
9999
retention-days: 1
@@ -138,7 +138,7 @@ jobs:
138138
run: validation/jacoco-aggregate.sh
139139
- name: publish jacoco report
140140
if: ${{ matrix.JAVA_VERSION == env.JAVA_VERSION }}
141-
uses: actions/upload-artifact@v6
141+
uses: actions/upload-artifact@v7
142142
with:
143143
name: jacoco_report
144144
path: publish/

common-tools/clas-io/src/main/java/org/jlab/utils/HipoDiff.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package org.jlab.utils;
22

33
import java.util.ArrayList;
4+
import java.util.Arrays;
45
import java.util.HashMap;
6+
import java.util.List;
57
import org.jlab.jnp.hipo4.io.HipoReader;
68
import org.jlab.jnp.hipo4.data.Bank;
79
import org.jlab.jnp.hipo4.data.Event;
@@ -109,6 +111,7 @@ public static void main(String args[]) {
109111
op.addOption("-q", null, "quiet mode");
110112
op.addOption("-Q", null, "verbose mode");
111113
op.addOption("-b", null, "name of bank to diff");
114+
op.addOption("-B", "", "names of banks to ignore (comma separated)");
112115
op.addOption("-s", null, "sort on column index");
113116
op.addOption("-o", null, "output HIPO diff file");
114117
op.setRequiresInputList(true);
@@ -135,10 +138,13 @@ public static void main(String args[]) {
135138
SchemaFactory sf = readerA.getSchemaFactory();
136139
runConfigBank = new Bank(sf.getSchema("RUN::config"));
137140

141+
List<String> ignoreBanks = Arrays.asList(op.getOption("-B").stringValue().split(","));
138142
if (op.getOption("-b").stringValue() == null) {
139143
for (Schema s : sf.getSchemaList()) {
140-
banksA.add(new DiffBank(s));
141-
banksB.add(new DiffBank(s));
144+
if (!ignoreBanks.contains(s.getName())) {
145+
banksA.add(new DiffBank(s));
146+
banksB.add(new DiffBank(s));
147+
}
142148
}
143149
} else {
144150
banksA.add(new DiffBank(sf.getSchema(op.getOption("-b").stringValue())));

0 commit comments

Comments
 (0)