From 2b775ed96f56ac4d23ab3efd8f2c05fe74488a55 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Sun, 14 Jul 2024 17:09:51 +0000 Subject: [PATCH 1/8] Update README with XMI structure and query breakdowns --- model/queries_execution_notebook.ipynb | 226 ++++++++++++------------- 1 file changed, 113 insertions(+), 113 deletions(-) diff --git a/model/queries_execution_notebook.ipynb b/model/queries_execution_notebook.ipynb index 8ba8078f2..03e26f540 100644 --- a/model/queries_execution_notebook.ipynb +++ b/model/queries_execution_notebook.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "markdown", - "id": "be35de5a", + "id": "779e5ef4", "metadata": {}, "source": [ "# Query Execution Notebook" @@ -11,7 +11,7 @@ { "cell_type": "code", "execution_count": null, - "id": "0bc0eec1", + "id": "eb0b307f", "metadata": {}, "outputs": [], "source": [ @@ -20,7 +20,7 @@ }, { "cell_type": "markdown", - "id": "b9e63956", + "id": "033c7ed8", "metadata": {}, "source": [ "## anatomy_query\n", @@ -30,7 +30,7 @@ { "cell_type": "code", "execution_count": null, - "id": "62ef69fc", + "id": "969267c7", "metadata": {}, "outputs": [], "source": [ @@ -57,7 +57,7 @@ }, { "cell_type": "markdown", - "id": "e84756cd", + "id": "5a4cf7ae", "metadata": {}, "source": [ "## anat_image_query\n", @@ -67,7 +67,7 @@ { "cell_type": "code", "execution_count": null, - "id": "9b07502b", + "id": "5c26fb13", "metadata": {}, "outputs": [], "source": [ @@ -94,7 +94,7 @@ }, { "cell_type": "markdown", - "id": "32c752e2", + "id": "d0ec2506", "metadata": {}, "source": [ "## Get other cluster members\n", @@ -104,7 +104,7 @@ { "cell_type": "code", "execution_count": null, - "id": "cfd2bf55", + "id": "3b0b33d3", "metadata": {}, "outputs": [], "source": [ @@ -131,7 +131,7 @@ }, { "cell_type": "markdown", - "id": "f9995af0", + "id": "0b9f6159", "metadata": {}, "source": [ "## Fetch all example individuals for Class\n", @@ -141,7 +141,7 @@ { "cell_type": "code", "execution_count": null, - "id": "8ecb3bcb", + "id": "decc9fdf", "metadata": {}, "outputs": [], "source": [ @@ -168,7 +168,7 @@ }, { "cell_type": "markdown", - "id": "a9b1e773", + "id": "79dd953e", "metadata": {}, "source": [ "## Find domain individuals for template id\n", @@ -178,7 +178,7 @@ { "cell_type": "code", "execution_count": null, - "id": "766e5e60", + "id": "ff15b560", "metadata": {}, "outputs": [], "source": [ @@ -205,7 +205,7 @@ }, { "cell_type": "markdown", - "id": "6402e2a2", + "id": "cec3c038", "metadata": {}, "source": [ "## Get cluster members\n", @@ -215,7 +215,7 @@ { "cell_type": "code", "execution_count": null, - "id": "bc2556f8", + "id": "8fde8694", "metadata": {}, "outputs": [], "source": [ @@ -242,7 +242,7 @@ }, { "cell_type": "markdown", - "id": "5d2282a2", + "id": "d5b1d23e", "metadata": {}, "source": [ "## Find images for dataset\n", @@ -252,7 +252,7 @@ { "cell_type": "code", "execution_count": null, - "id": "29e38eff", + "id": "c46973a6", "metadata": {}, "outputs": [], "source": [ @@ -279,7 +279,7 @@ }, { "cell_type": "markdown", - "id": "a420db86", + "id": "2c03f5c2", "metadata": {}, "source": [ "## Find images aligned to template id\n", @@ -289,7 +289,7 @@ { "cell_type": "code", "execution_count": null, - "id": "ae7d0d48", + "id": "757950ec", "metadata": {}, "outputs": [], "source": [ @@ -316,7 +316,7 @@ }, { "cell_type": "markdown", - "id": "c3ed67a5", + "id": "aeb8f17c", "metadata": {}, "source": [ "## Test Query for Exp from Anatomy\n", @@ -326,7 +326,7 @@ { "cell_type": "code", "execution_count": null, - "id": "7cda1c51", + "id": "035b9bf7", "metadata": {}, "outputs": [], "source": [ @@ -353,7 +353,7 @@ }, { "cell_type": "markdown", - "id": "9b7aeb1d", + "id": "c3f92a80", "metadata": {}, "source": [ "## Query for Anatomy from Exp\n", @@ -363,7 +363,7 @@ { "cell_type": "code", "execution_count": null, - "id": "8fa0c3ee", + "id": "bf3934cb", "metadata": {}, "outputs": [], "source": [ @@ -390,7 +390,7 @@ }, { "cell_type": "markdown", - "id": "4e435325", + "id": "6c67342a", "metadata": {}, "source": [ "## Test Query for Anatomy from Exp\n", @@ -400,7 +400,7 @@ { "cell_type": "code", "execution_count": null, - "id": "28054007", + "id": "e51119d4", "metadata": {}, "outputs": [], "source": [ @@ -427,7 +427,7 @@ }, { "cell_type": "markdown", - "id": "d7213764", + "id": "f04cb867", "metadata": {}, "source": [ "## Query for Exp from Anatomy\n", @@ -437,7 +437,7 @@ { "cell_type": "code", "execution_count": null, - "id": "4cc5ed44", + "id": "8737a357", "metadata": {}, "outputs": [], "source": [ @@ -464,7 +464,7 @@ }, { "cell_type": "markdown", - "id": "806160f1", + "id": "0b732d01", "metadata": {}, "source": [ "## template_2_datasets_query\n", @@ -474,7 +474,7 @@ { "cell_type": "code", "execution_count": null, - "id": "61a552e0", + "id": "fa9a43d2", "metadata": {}, "outputs": [], "source": [ @@ -501,7 +501,7 @@ }, { "cell_type": "markdown", - "id": "29b030ef", + "id": "a3e56e8a", "metadata": {}, "source": [ "## test_all_datasets_query\n", @@ -511,7 +511,7 @@ { "cell_type": "code", "execution_count": null, - "id": "c6163015", + "id": "dbdcead9", "metadata": {}, "outputs": [], "source": [ @@ -538,7 +538,7 @@ }, { "cell_type": "markdown", - "id": "71d6bec0", + "id": "4b480901", "metadata": {}, "source": [ "## Query for Exp from Anatomy\n", @@ -548,7 +548,7 @@ { "cell_type": "code", "execution_count": null, - "id": "8cfb20cc", + "id": "45c5d97c", "metadata": {}, "outputs": [], "source": [ @@ -575,7 +575,7 @@ }, { "cell_type": "markdown", - "id": "c7fb4e07", + "id": "a6880d79", "metadata": {}, "source": [ "## neuron_region_connectivity_query\n", @@ -585,7 +585,7 @@ { "cell_type": "code", "execution_count": null, - "id": "20aefe4a", + "id": "72a50409", "metadata": {}, "outputs": [], "source": [ @@ -612,7 +612,7 @@ }, { "cell_type": "markdown", - "id": "9238d2c4", + "id": "32f79461", "metadata": {}, "source": [ "## neuron_neuron_connectivity_query\n", @@ -622,7 +622,7 @@ { "cell_type": "code", "execution_count": null, - "id": "775943cd", + "id": "01898cd1", "metadata": {}, "outputs": [], "source": [ @@ -649,7 +649,7 @@ }, { "cell_type": "markdown", - "id": "64ff9c19", + "id": "4d1b5f91", "metadata": {}, "source": [ "## NBLAST_anat_image_query\n", @@ -659,7 +659,7 @@ { "cell_type": "code", "execution_count": null, - "id": "9d22395c", + "id": "5277e4d7", "metadata": {}, "outputs": [], "source": [ @@ -686,7 +686,7 @@ }, { "cell_type": "markdown", - "id": "5cbed346", + "id": "2d93d24a", "metadata": {}, "source": [ "## Fetch all entities for pub\n", @@ -696,7 +696,7 @@ { "cell_type": "code", "execution_count": null, - "id": "64550344", + "id": "daade1a9", "metadata": {}, "outputs": [], "source": [ @@ -723,7 +723,7 @@ }, { "cell_type": "markdown", - "id": "baab6bba", + "id": "922cb139", "metadata": {}, "source": [ "## NBLAST_anat_image_query_exp\n", @@ -733,7 +733,7 @@ { "cell_type": "code", "execution_count": null, - "id": "bd56edd2", + "id": "b42b9095", "metadata": {}, "outputs": [], "source": [ @@ -760,7 +760,7 @@ }, { "cell_type": "markdown", - "id": "683a77d4", + "id": "02d21feb", "metadata": {}, "source": [ "## NB_anat_image_query\n", @@ -770,7 +770,7 @@ { "cell_type": "code", "execution_count": null, - "id": "9e7053f5", + "id": "40b2c749", "metadata": {}, "outputs": [], "source": [ @@ -797,7 +797,7 @@ }, { "cell_type": "markdown", - "id": "389ac5b8", + "id": "02a42acf", "metadata": {}, "source": [ "## Get JSON for cluster expression query\n", @@ -807,7 +807,7 @@ { "cell_type": "code", "execution_count": null, - "id": "2e9a5800", + "id": "733e2ff3", "metadata": {}, "outputs": [], "source": [ @@ -834,7 +834,7 @@ }, { "cell_type": "markdown", - "id": "b63d6af9", + "id": "202c4cd1", "metadata": {}, "source": [ "## Get JSON for anat scRNAseq query\n", @@ -844,7 +844,7 @@ { "cell_type": "code", "execution_count": null, - "id": "b5548d99", + "id": "ca92b11b", "metadata": {}, "outputs": [], "source": [ @@ -871,7 +871,7 @@ }, { "cell_type": "markdown", - "id": "7a1eaed3", + "id": "e12bdc38", "metadata": {}, "source": [ "## Get JSON for dataset scRNAseq query\n", @@ -881,7 +881,7 @@ { "cell_type": "code", "execution_count": null, - "id": "4d694ee2", + "id": "5122b0bf", "metadata": {}, "outputs": [], "source": [ @@ -908,7 +908,7 @@ }, { "cell_type": "markdown", - "id": "f332cb4a", + "id": "27e54839", "metadata": {}, "source": [ "## Get JSON for cluster expression query\n", @@ -918,7 +918,7 @@ { "cell_type": "code", "execution_count": null, - "id": "9e9b2fad", + "id": "728e578b", "metadata": {}, "outputs": [], "source": [ @@ -945,7 +945,7 @@ }, { "cell_type": "markdown", - "id": "53c4d882", + "id": "cd3809c1", "metadata": {}, "source": [ "## Get term core info\n", @@ -955,7 +955,7 @@ { "cell_type": "code", "execution_count": null, - "id": "fb5081fa", + "id": "08aedb25", "metadata": {}, "outputs": [], "source": [ @@ -982,7 +982,7 @@ }, { "cell_type": "markdown", - "id": "619e3081", + "id": "bb51fe22", "metadata": {}, "source": [ "## Get baseline term info\n", @@ -992,7 +992,7 @@ { "cell_type": "code", "execution_count": null, - "id": "fa98e90b", + "id": "25b0a81f", "metadata": {}, "outputs": [], "source": [ @@ -1019,7 +1019,7 @@ }, { "cell_type": "markdown", - "id": "a01cd6ed", + "id": "ecfbb2e6", "metadata": {}, "source": [ "## Get JSON for Class\n", @@ -1029,7 +1029,7 @@ { "cell_type": "code", "execution_count": null, - "id": "271de81b", + "id": "b58180fe", "metadata": {}, "outputs": [], "source": [ @@ -1056,7 +1056,7 @@ }, { "cell_type": "markdown", - "id": "fd1d836a", + "id": "8607bad5", "metadata": {}, "source": [ "## Get JSON for Neuron Class\n", @@ -1066,7 +1066,7 @@ { "cell_type": "code", "execution_count": null, - "id": "66bcc1ca", + "id": "b7a7ced1", "metadata": {}, "outputs": [], "source": [ @@ -1093,7 +1093,7 @@ }, { "cell_type": "markdown", - "id": "feccb163", + "id": "f7d2a878", "metadata": {}, "source": [ "## Get JSON for Split Class\n", @@ -1103,7 +1103,7 @@ { "cell_type": "code", "execution_count": null, - "id": "41e595bf", + "id": "fcd6b85f", "metadata": {}, "outputs": [], "source": [ @@ -1130,7 +1130,7 @@ }, { "cell_type": "markdown", - "id": "26d4c046", + "id": "4a4f032a", "metadata": {}, "source": [ "## Get JSON for Individual\n", @@ -1140,7 +1140,7 @@ { "cell_type": "code", "execution_count": null, - "id": "5135666a", + "id": "22465198", "metadata": {}, "outputs": [], "source": [ @@ -1167,7 +1167,7 @@ }, { "cell_type": "markdown", - "id": "d786128e", + "id": "20eed0d3", "metadata": {}, "source": [ "## Get JSON for Cluster\n", @@ -1177,7 +1177,7 @@ { "cell_type": "code", "execution_count": null, - "id": "8001bf6f", + "id": "ee0ad66d", "metadata": {}, "outputs": [], "source": [ @@ -1204,7 +1204,7 @@ }, { "cell_type": "markdown", - "id": "ed51a87e", + "id": "8b381712", "metadata": {}, "source": [ "## Get JSON for Template\n", @@ -1214,7 +1214,7 @@ { "cell_type": "code", "execution_count": null, - "id": "299b54d9", + "id": "75847e22", "metadata": {}, "outputs": [], "source": [ @@ -1241,7 +1241,7 @@ }, { "cell_type": "markdown", - "id": "792603cf", + "id": "66160240", "metadata": {}, "source": [ "## Get JSON for pub\n", @@ -1251,7 +1251,7 @@ { "cell_type": "code", "execution_count": null, - "id": "96e1cd55", + "id": "5a6372e1", "metadata": {}, "outputs": [], "source": [ @@ -1278,7 +1278,7 @@ }, { "cell_type": "markdown", - "id": "a8170f2a", + "id": "55e73620", "metadata": {}, "source": [ "## Get JSON for DataSet\n", @@ -1288,7 +1288,7 @@ { "cell_type": "code", "execution_count": null, - "id": "7bc0690d", + "id": "7e4965c1", "metadata": {}, "outputs": [], "source": [ @@ -1315,7 +1315,7 @@ }, { "cell_type": "markdown", - "id": "2b81ab03", + "id": "498eb0e1", "metadata": {}, "source": [ "## Get JSON for License\n", @@ -1325,7 +1325,7 @@ { "cell_type": "code", "execution_count": null, - "id": "3e6e1ec7", + "id": "ed30c9ca", "metadata": {}, "outputs": [], "source": [ @@ -1352,7 +1352,7 @@ }, { "cell_type": "markdown", - "id": "932d6bf2", + "id": "be0337cf", "metadata": {}, "source": [ "## Owlery Part of\n", @@ -1362,7 +1362,7 @@ { "cell_type": "code", "execution_count": null, - "id": "c72aa25c", + "id": "9902d832", "metadata": {}, "outputs": [], "source": [ @@ -1385,7 +1385,7 @@ }, { "cell_type": "markdown", - "id": "ea2c5a95", + "id": "6e3d4646", "metadata": {}, "source": [ "## Owlery Neuron class with part here\n", @@ -1395,7 +1395,7 @@ { "cell_type": "code", "execution_count": null, - "id": "a2ad71da", + "id": "ebc3cf38", "metadata": {}, "outputs": [], "source": [ @@ -1418,7 +1418,7 @@ }, { "cell_type": "markdown", - "id": "2028a2da", + "id": "f6b3d04a", "metadata": {}, "source": [ "## Owlery Neurons Synaptic\n", @@ -1428,7 +1428,7 @@ { "cell_type": "code", "execution_count": null, - "id": "8f56a78d", + "id": "93d9e23d", "metadata": {}, "outputs": [], "source": [ @@ -1451,7 +1451,7 @@ }, { "cell_type": "markdown", - "id": "6036dad0", + "id": "947b80a8", "metadata": {}, "source": [ "## Owlery Neurons Presynaptic\n", @@ -1461,7 +1461,7 @@ { "cell_type": "code", "execution_count": null, - "id": "0a84b7e9", + "id": "7491157f", "metadata": {}, "outputs": [], "source": [ @@ -1484,7 +1484,7 @@ }, { "cell_type": "markdown", - "id": "b810269f", + "id": "fd0ffc9e", "metadata": {}, "source": [ "## Owlery Neurons Postsynaptic\n", @@ -1494,7 +1494,7 @@ { "cell_type": "code", "execution_count": null, - "id": "74123342", + "id": "e4c1015f", "metadata": {}, "outputs": [], "source": [ @@ -1517,7 +1517,7 @@ }, { "cell_type": "markdown", - "id": "def179c4", + "id": "40fc97c2", "metadata": {}, "source": [ "## Owlery Neuron classes fasciculating here\n", @@ -1527,7 +1527,7 @@ { "cell_type": "code", "execution_count": null, - "id": "90fe4d98", + "id": "52f0a138", "metadata": {}, "outputs": [], "source": [ @@ -1550,7 +1550,7 @@ }, { "cell_type": "markdown", - "id": "2a9f3a1c", + "id": "6399d00c", "metadata": {}, "source": [ "## Owlery tracts in\n", @@ -1560,7 +1560,7 @@ { "cell_type": "code", "execution_count": null, - "id": "c2a9cc04", + "id": "cdbb1d99", "metadata": {}, "outputs": [], "source": [ @@ -1583,7 +1583,7 @@ }, { "cell_type": "markdown", - "id": "ba2fda89", + "id": "2bbeb6a9", "metadata": {}, "source": [ "## Owlery Subclasses of\n", @@ -1593,7 +1593,7 @@ { "cell_type": "code", "execution_count": null, - "id": "b254cc81", + "id": "a99fd033", "metadata": {}, "outputs": [], "source": [ @@ -1616,7 +1616,7 @@ }, { "cell_type": "markdown", - "id": "2aabb413", + "id": "2365e502", "metadata": {}, "source": [ "## Owlery Lineage Clones\n", @@ -1626,7 +1626,7 @@ { "cell_type": "code", "execution_count": null, - "id": "26a3d94f", + "id": "5d412f8c", "metadata": {}, "outputs": [], "source": [ @@ -1649,7 +1649,7 @@ }, { "cell_type": "markdown", - "id": "c477f572", + "id": "c522f36f", "metadata": {}, "source": [ "## subClassOf cell that overlaps some X\n", @@ -1659,7 +1659,7 @@ { "cell_type": "code", "execution_count": null, - "id": "58302ecb", + "id": "f92e0fb3", "metadata": {}, "outputs": [], "source": [ @@ -1682,7 +1682,7 @@ }, { "cell_type": "markdown", - "id": "d5b30ba0", + "id": "931af77f", "metadata": {}, "source": [ "## subClassOf overlaps some X\n", @@ -1692,7 +1692,7 @@ { "cell_type": "code", "execution_count": null, - "id": "c14dc922", + "id": "7206f21d", "metadata": {}, "outputs": [], "source": [ @@ -1715,7 +1715,7 @@ }, { "cell_type": "markdown", - "id": "6f41e045", + "id": "76ab7392", "metadata": {}, "source": [ "## subClassOf cell overlaps some X\n", @@ -1725,7 +1725,7 @@ { "cell_type": "code", "execution_count": null, - "id": "c22d62f8", + "id": "cf1a9392", "metadata": {}, "outputs": [], "source": [ @@ -1748,7 +1748,7 @@ }, { "cell_type": "markdown", - "id": "6bb80f8a", + "id": "9d20ea06", "metadata": {}, "source": [ "## Owlery Images of neurons with some part here (clustered)\n", @@ -1758,7 +1758,7 @@ { "cell_type": "code", "execution_count": null, - "id": "a3abe9ed", + "id": "4bad2bba", "metadata": {}, "outputs": [], "source": [ @@ -1781,7 +1781,7 @@ }, { "cell_type": "markdown", - "id": "2a616a5a", + "id": "1ba60c6e", "metadata": {}, "source": [ "## Owlery Images of neurons with some part here\n", @@ -1791,7 +1791,7 @@ { "cell_type": "code", "execution_count": null, - "id": "8c62b1cd", + "id": "34c94ea6", "metadata": {}, "outputs": [], "source": [ @@ -1814,7 +1814,7 @@ }, { "cell_type": "markdown", - "id": "52b540c2", + "id": "5dc017fb", "metadata": {}, "source": [ "## Owlery individual parts\n", @@ -1824,7 +1824,7 @@ { "cell_type": "code", "execution_count": null, - "id": "7be68e40", + "id": "0d12511e", "metadata": {}, "outputs": [], "source": [ @@ -1847,7 +1847,7 @@ }, { "cell_type": "markdown", - "id": "26b3a5d7", + "id": "80a09ab3", "metadata": {}, "source": [ "## Get anat_query\n", @@ -1857,7 +1857,7 @@ { "cell_type": "code", "execution_count": null, - "id": "1fbe1c79", + "id": "6caba432", "metadata": {}, "outputs": [], "source": [ @@ -1880,7 +1880,7 @@ }, { "cell_type": "markdown", - "id": "9987f181", + "id": "69e047b7", "metadata": {}, "source": [ "## Get user NBLAST results\n", @@ -1890,7 +1890,7 @@ { "cell_type": "code", "execution_count": null, - "id": "5a8cb7cb", + "id": "7a0aa7af", "metadata": {}, "outputs": [], "source": [ @@ -1913,7 +1913,7 @@ }, { "cell_type": "markdown", - "id": "d36f86f8", + "id": "7fe08352", "metadata": {}, "source": [ "## Get term info\n", @@ -1923,7 +1923,7 @@ { "cell_type": "code", "execution_count": null, - "id": "39431399", + "id": "7446f028", "metadata": {}, "outputs": [], "source": [ @@ -1946,7 +1946,7 @@ }, { "cell_type": "markdown", - "id": "2983c1f5", + "id": "6d8da019", "metadata": {}, "source": [ "## Get cached VFB_JSON for Term\n", @@ -1956,7 +1956,7 @@ { "cell_type": "code", "execution_count": null, - "id": "522b2b9a", + "id": "ec0af57f", "metadata": {}, "outputs": [], "source": [ @@ -1981,4 +1981,4 @@ "metadata": {}, "nbformat": 4, "nbformat_minor": 5 -} \ No newline at end of file +} From ec373ca4c6715b48b1faf1fd99d664d6054dadd5 Mon Sep 17 00:00:00 2001 From: Rob Court Date: Tue, 15 Oct 2024 21:57:49 +0100 Subject: [PATCH 2/8] using latest query processor --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9f620a166..5e9c13c3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ARG geppettoDatasourceRelease=passingSOLR ARG geppettoModelSwcRelease=v1.0.1 ARG geppettoFrontendRelease=VFBv2.1.0.3 ARG geppettoClientRelease=VFBv2.2.5 -ARG ukAcVfbGeppettoRelease=v2.2.4.3 +ARG ukAcVfbGeppettoRelease=v2.2.4.4 ARG mvnOpt="-Dhttps.protocols=TLSv1.2 -DskipTests --quiet -Pmaster" From 549bcbcf35fdbf29e4a9f3b82e40a6d26a2d4776 Mon Sep 17 00:00:00 2001 From: Rob Court Date: Tue, 15 Oct 2024 22:00:47 +0100 Subject: [PATCH 3/8] v4 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3178fe649..c78230fd6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # Decide based on branch which servers to use - name: Pass branch From 52ed7edb5809b41a3e049b5bc297f3f768261182 Mon Sep 17 00:00:00 2001 From: Rob Court Date: Tue, 15 Oct 2024 22:01:42 +0100 Subject: [PATCH 4/8] v4 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c78230fd6..cf033766a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -198,7 +198,7 @@ jobs: fi - name: Stop VFB server run: docker stop testServer - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: ${{ failure() }} with: name: test_fails From 3f034c385d9d7a2aeed95ed85339713d7b55984c Mon Sep 17 00:00:00 2001 From: Rob Court Date: Fri, 25 Oct 2024 14:33:36 +0100 Subject: [PATCH 5/8] typo fix --- components/interface/VFBFocusTerm/VFBFocusTerm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/interface/VFBFocusTerm/VFBFocusTerm.js b/components/interface/VFBFocusTerm/VFBFocusTerm.js index 12d6e78d8..ab44305f4 100644 --- a/components/interface/VFBFocusTerm/VFBFocusTerm.js +++ b/components/interface/VFBFocusTerm/VFBFocusTerm.js @@ -571,7 +571,7 @@ class VFBFocusTerm extends React.Component { : } + title="NBLAST Uploader"> { this.props.UIUpdateManager("uploaderContentsVisible"); From 3407eed65bf7a0e9f1bbb31f854ab1f5b6baaef6 Mon Sep 17 00:00:00 2001 From: Rob Court Date: Tue, 21 Jan 2025 13:39:23 +0000 Subject: [PATCH 6/8] runs-on: ubuntu-22.04 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cf033766a..c1ca70a3f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: # Deploy the local and remote versions of geppetto-vfb deploy-test: # The type of runner that the job will run on - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 # total job timeout: timeout-minutes: 590 From 9413b2f86b86d590d374faa960f66c70df265aa9 Mon Sep 17 00:00:00 2001 From: Rob Court Date: Tue, 21 Jan 2025 14:02:40 +0000 Subject: [PATCH 7/8] Client to v2.2.7 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5e9c13c3b..c2fb40f8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG geppettoSimulationRelease=VFBv2.1.0.2 ARG geppettoDatasourceRelease=passingSOLR ARG geppettoModelSwcRelease=v1.0.1 ARG geppettoFrontendRelease=VFBv2.1.0.3 -ARG geppettoClientRelease=VFBv2.2.5 +ARG geppettoClientRelease=VFBv2.2.7 ARG ukAcVfbGeppettoRelease=v2.2.4.4 ARG mvnOpt="-Dhttps.protocols=TLSv1.2 -DskipTests --quiet -Pmaster" From 061921eb18c75c0db34b8b5772655cacee30047e Mon Sep 17 00:00:00 2001 From: Rob Court Date: Tue, 21 Jan 2025 15:49:38 +0000 Subject: [PATCH 8/8] Datasource VFBv2.2.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c2fb40f8e..74a13a228 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG geppettoRelease=vfb_20200604_a ARG geppettoModelRelease=vfb_20200604_a ARG geppettoCoreRelease=VFBv2.2.0 ARG geppettoSimulationRelease=VFBv2.1.0.2 -ARG geppettoDatasourceRelease=passingSOLR +ARG geppettoDatasourceRelease=VFBv2.2.0 ARG geppettoModelSwcRelease=v1.0.1 ARG geppettoFrontendRelease=VFBv2.1.0.3 ARG geppettoClientRelease=VFBv2.2.7