diff --git a/.github/workflows/cucumber_tests.yml b/.github/workflows/cucumber_tests.yml index 9484fbca19..0f34c1a757 100644 --- a/.github/workflows/cucumber_tests.yml +++ b/.github/workflows/cucumber_tests.yml @@ -64,6 +64,12 @@ jobs: - name: Setup Node uses: sanger/.github/.github/actions/setup/node@master + - name: Fix apt mirrors + networking + run: | + sudo sed -i 's|http://azure.archive.ubuntu.com|http://archive.ubuntu.com|g' /etc/apt/apt-mirrors.txt + echo 'Acquire::ForceIPv4 "true";' | sudo tee /etc/apt/apt.conf.d/99force-ipv4 + echo 'Acquire::Retries "1";' | sudo tee /etc/apt/apt.conf.d/80-retries + - name: Setup stable Chrome uses: sanger/.github/.github/actions/tests/setup-chrome@master with: diff --git a/.github/workflows/rspec_feature_tests.yml b/.github/workflows/rspec_feature_tests.yml index bc71e576e6..781da98e49 100644 --- a/.github/workflows/rspec_feature_tests.yml +++ b/.github/workflows/rspec_feature_tests.yml @@ -64,6 +64,12 @@ jobs: - name: Setup Node uses: sanger/.github/.github/actions/setup/node@master + - name: Fix apt mirrors + networking + run: | + sudo sed -i 's|http://azure.archive.ubuntu.com|http://archive.ubuntu.com|g' /etc/apt/apt-mirrors.txt + echo 'Acquire::ForceIPv4 "true";' | sudo tee /etc/apt/apt.conf.d/99force-ipv4 + echo 'Acquire::Retries "1";' | sudo tee /etc/apt/apt.conf.d/80-retries + - name: Setup stable Chrome uses: sanger/.github/.github/actions/tests/setup-chrome@master with: diff --git a/.nvmrc b/.nvmrc index 8e35034890..5bf4400f22 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -24.14.1 +24.15.0 diff --git a/Gemfile.lock b/Gemfile.lock index 612b74f9c8..2b3a35a076 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -338,7 +338,7 @@ GEM bigdecimal net-http (0.9.1) uri (>= 0.11.1) - net-imap (0.6.3) + net-imap (0.6.4) date net-protocol net-ldap (0.20.0) diff --git a/config/default_records/descriptors/002_element_aviti_descriptors.yml b/config/default_records/descriptors/002_element_aviti_descriptors.yml index 91335a9e02..ec39b26ec9 100644 --- a/config/default_records/descriptors/002_element_aviti_descriptors.yml +++ b/config/default_records/descriptors/002_element_aviti_descriptors.yml @@ -7,6 +7,7 @@ Quant method used: selection: Tapestation: Tapestation Tapestation & qPCR: Tapestation & qPCR + Not applicable: Not applicable required: true sorter: 0 Pipette Carousel: diff --git a/package.json b/package.json index 55ecab2974..f3127c1f9d 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "bootstrap": "^4.6.2", "codemirror": "^5.65.18", "css-loader": "^6.0.0", - "datatables.net-bs4": "^2.3.6", + "datatables.net-bs4": "^2.3.8", "datatables.net-buttons-bs4": "^3.2.6", "datatables.net-fixedcolumns-bs4": "^5.0.5", "datatables.net-fixedheader-bs4": "^4.0.5", diff --git a/yarn.lock b/yarn.lock index 2317815f9b..444336d89b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1855,7 +1855,7 @@ data-urls@^5.0.0: whatwg-mimetype "^4.0.0" whatwg-url "^14.0.0" -datatables.net-bs4@>=1.11.0, datatables.net-bs4@^2, datatables.net-bs4@^2.3.6: +datatables.net-bs4@>=1.11.0, datatables.net-bs4@^2: version "2.3.7" resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-2.3.7.tgz#c361ff8f439bf63e1ec4862085ec667fb96bfd7f" integrity sha512-ZyofK/3Unj0lQdAIsI9gT5oGCwTnx8y2UF6muYkbdO/Rw9h+x2kQwFkuCX5J0j6N2B+YCwzHk2OPu9yU8nk1Kw== @@ -1863,6 +1863,14 @@ datatables.net-bs4@>=1.11.0, datatables.net-bs4@^2, datatables.net-bs4@^2.3.6: datatables.net "2.3.7" jquery ">=1.7" +datatables.net-bs4@^2.3.8: + version "2.3.8" + resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-2.3.8.tgz#da3660b5981ba062aa59dda1c81c524201111742" + integrity sha512-i65jbIw6DPG6KyUXRacCFzbawRYA2UjPg68tPkOns/r9YXQngSMQ/+izdmJk1xnPDRXh3cuTqV8cqOIy1NXH1A== + dependencies: + datatables.net "2.3.8" + jquery ">=1.7" + datatables.net-buttons-bs4@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/datatables.net-buttons-bs4/-/datatables.net-buttons-bs4-3.2.6.tgz#a2b11cf21c685b1389ac4d7d9fa362f156732952" @@ -1972,6 +1980,13 @@ datatables.net@2.3.7, datatables.net@>=1.11.0, datatables.net@^2: dependencies: jquery ">=1.7" +datatables.net@2.3.8: + version "2.3.8" + resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.3.8.tgz#55a8dbe3bd2196951c498ab79bf44602a2bf3229" + integrity sha512-uhViowhlDlheAuo5a8TrkQqADsjrtGeOyvrigvr4t0+K3MyAWqClORXWAYIcN9VLX6iIX0C8O9gwJNd01hITRg== + dependencies: + jquery ">=1.7" + debug@4, debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.4.3: version "4.4.3" resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"