From a8841bffb7274fe84c092cf0950dcd5ae7c0d001 Mon Sep 17 00:00:00 2001 From: NeuralFlux <40491005+NeuralFlux@users.noreply.github.com> Date: Fri, 9 Aug 2024 15:30:47 -0400 Subject: [PATCH 1/2] fix: changed test concept order based on NodeNorm priority --- __tests__/integration/sri_resolver.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/__tests__/integration/sri_resolver.test.ts b/__tests__/integration/sri_resolver.test.ts index d3c2602..caaef31 100644 --- a/__tests__/integration/sri_resolver.test.ts +++ b/__tests__/integration/sri_resolver.test.ts @@ -86,12 +86,12 @@ describe("Test SRI Resolver", () => { test("Test handling semantic type conflicts", async () => { let input = { - "SmallMolecule": ["PUBCHEM.COMPOUND:23680530"] + "MolecularMixture": ["PUBCHEM.COMPOUND:23680530"] }; const res = await resolveSRI(input); expect(res["PUBCHEM.COMPOUND:23680530"].primaryTypes.length).toBe(2); - expect(res["PUBCHEM.COMPOUND:23680530"].primaryTypes).toEqual(["MolecularMixture", "SmallMolecule"]) + expect(res["PUBCHEM.COMPOUND:23680530"].primaryTypes).toEqual(["SmallMolecule", "MolecularMixture"]) }); test("Test large batch of inputs should be correctly resolved and should not give an error", async () => { From d30f70f2d5863827008a21961c49f81589050c62 Mon Sep 17 00:00:00 2001 From: NeuralFlux <40491005+NeuralFlux@users.noreply.github.com> Date: Thu, 15 Aug 2024 17:32:55 -0400 Subject: [PATCH 2/2] fix: update GitHub workflow to switch to main branch by default --- .github/workflows/test_ws_codecov.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_ws_codecov.yml b/.github/workflows/test_ws_codecov.yml index b01f941..f950897 100644 --- a/.github/workflows/test_ws_codecov.yml +++ b/.github/workflows/test_ws_codecov.yml @@ -13,11 +13,21 @@ jobs: id: branch-name uses: tj-actions/branch-names@v7.0.7 - - uses: actions/checkout@v3 + - name: Checkout to specific branch + uses: actions/checkout@v3 + id: specific-checkout + continue-on-error: true with: repository: biothings/biothings_explorer ref: ${{ steps.branch-name.outputs.current_branch }} + - name: Checkout to main if above failed + if: steps.specific-checkout.outcome == 'failure' + uses: actions/checkout@v3 + with: + repository: biothings/biothings_explorer + ref: main + - name: Use Node.js 18.x uses: actions/setup-node@v3 with: