diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/tools/continuous-integration | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/tools/continuous-integration')
12 files changed, 108 insertions, 75 deletions
diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 7ed0fa1911aa..897b191cdd66 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,13 +3,13 @@ nixosTests }: buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.32.3"; + version = "3.33.3"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-uckFsM8UWkiDmTpLRu34qKdjgEQrbsa+K8QtVS2PJ7A="; + sha256 = "sha256-RCKHVFYYcWraUwsGuD/anmWpNwc7cHc9jm0LwR9WRzA="; }; vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI="; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index feba78b0681b..f2136346c1f3 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.5.0"; + version = "7.6.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-5+zAIvm4RgXc09HwSNlSjChL4NhMMiGDMtAVlmV/BYE="; + sha256 = "sha256-Zi+gyO+2AKDgcfgYrzLskJYZ6hQKOVlOL7Y9nxH/pGg="; }; - vendorSha256 = "sha256-Z6zxSbzn1/u+3Z9PeRl6iO0pVlw/lGtFjAuZpGrRDDY="; + vendorSha256 = "sha256-OF3parnlTPmcr7tVcc6495sUMRApSpBHHjSE/4EFIxE="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix index 8eb2ab61b487..e784e3fe330e 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -14,6 +14,7 @@ , lttng-ust , makeWrapper , nodejs-12_x +, nodejs-16_x , openssl , stdenv , zlib @@ -29,18 +30,21 @@ let nugetSource = linkFarm "nuget-packages" nugetPackages; dotnetSdk = dotnetCorePackages.sdk_3_1; - runtimeId = "linux-x64"; + runtimeId = + if stdenv.isAarch64 + then "linux-arm64" + else "linux-x64"; fakeSha1 = "0000000000000000000000000000000000000000"; in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.283.3"; + version = "2.285.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - sha256 = "sha256-B2dn3AIGk+xMFqRsKv4pvlZ6K4xySsS0klk8vN8giso="; + hash = "sha256-SlKUuebsoZ9OgYuDTNOlY1KMg01LFSFazrLCctiFq3A="; }; nativeBuildInputs = [ @@ -139,6 +143,9 @@ stdenv.mkDerivation rec { disabledTests = [ # Self-updating is patched out, hence this test will fail "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64" + "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync" ] ++ map # Online tests (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") @@ -186,6 +193,7 @@ stdenv.mkDerivation rec { mkdir -p _layout/externals ln -s ${nodejs-12_x} _layout/externals/node12 + ln -s ${nodejs-16_x} _layout/externals/node16 # BUILDCONFIG needs to be "Debug" dotnet msbuild \ @@ -227,11 +235,17 @@ stdenv.mkDerivation rec { --replace './externals' "$out/externals" \ --replace './bin' "$out/lib" - # The upstream package includes Node 12 and expects it at the path - # externals/node12. As opposed to the official releases, we don't - # link the Alpine Node flavor. + # The upstream package includes Node {12,16} and expects it at the path + # externals/node{12,16}. As opposed to the official releases, we don't + # link the Alpine Node flavors. mkdir -p $out/externals ln -s ${nodejs-12_x} $out/externals/node12 + ln -s ${nodejs-16_x} $out/externals/node16 + + # Install Nodejs scripts called from workflows + install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/hashFiles/index.js + mkdir -p $out/lib/checkScripts + install src/Misc/layoutbin/checkScripts/* $out/lib/checkScripts/ runHook postInstall ''; @@ -271,7 +285,7 @@ stdenv.mkDerivation rec { description = "Self-hosted runner for GitHub Actions"; homepage = "https://github.com/actions/runner"; license = licenses.mit; - maintainers = with maintainers; [ veehaitch ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ veehaitch newam ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix index a0e9230517b6..197927674be1 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -15,8 +15,13 @@ in }) (fetchNuGet { name = "microsoft.aspnetcore.app.runtime.linux-x64"; - version = "3.1.19"; - sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; + version = "3.1.21"; + sha256 = "056g9nv8a7n8zdbgzmyzmn3pbg52yq2kv5d1rcp7h6plwzgpiwql"; + }) + (fetchNuGet { + name = "microsoft.aspnetcore.app.runtime.linux-arm64"; + version = "3.1.21"; + sha256 = "0147s60lvbzj2agb4wgwvkxacq96mqsgayxkbpjqybnc8ggzqkvr"; }) (fetchNuGet { name = "microsoft.aspnet.webapi.client"; @@ -40,8 +45,13 @@ in }) (fetchNuGet { name = "microsoft.netcore.app.runtime.linux-x64"; - version = "3.1.19"; - sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; + version = "3.1.21"; + sha256 = "13692wqcww0w6x4nhyxpxwprdg6mx9xmlvv38m6fvp6g0m27r43v"; + }) + (fetchNuGet { + name = "microsoft.netcore.app.runtime.linux-arm64"; + version = "3.1.21"; + sha256 = "04rp4j2kyzslyfbzldm2ndb6v4g7jq9xi9bmvss34fh25gdgqs3q"; }) (fetchNuGet { name = "microsoft.netcore.platforms"; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch new file mode 100644 index 000000000000..a1736d83a656 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch @@ -0,0 +1,30 @@ +From 13c633bf0075daa6ff973f368a25cf205caa017e Mon Sep 17 00:00:00 2001 +From: Pascal Bach <pascal.bach@nextrem.ch> +Date: Sat, 11 Dec 2021 10:07:01 +0100 +Subject: [PATCH] gitlab-runner: don't checked for fixed runtime + +We already use 1.16.12 which has the proper fix +--- + helpers/patches/issue_28732/syscall.go | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/helpers/patches/issue_28732/syscall.go b/helpers/patches/issue_28732/syscall.go +index 580513b57..fa9e4cc85 100644 +--- a/helpers/patches/issue_28732/syscall.go ++++ b/helpers/patches/issue_28732/syscall.go +@@ -2,11 +2,6 @@ + + package issue_28732 + +-import ( +- "syscall" +-) +- + func AssertFixPresent() { +- // Ensure that Issue28732Fix fixed runtime is used +- syscall.Issue28732Fix() ++ // Issue already fixed by using go 1.16.12 + } +-- +2.34.0 + diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 95365cd9caa1..a8456d09f989 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,17 +1,7 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "14.3.2"; - # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 - docker_x86_64 = fetchurl { - url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.x86_64"; - sha256 = "0np2ijgrq6yg3r0744qlj9a9va7y996f7csfs4ajyfqq3vm7jz2g"; - }; - - docker_arm = fetchurl { - url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.arm"; - sha256 = "0adjczad3y2f55i76pcp1q2kzdwqr04y59bslb9523s4dlav9jcd"; - }; + version = "14.6.0"; in buildGoPackage rec { inherit version; @@ -29,16 +19,13 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "15mwyhr7a4b9vl7c0qz299qv91h3kcmf6d6p5vjjrm1phiy3bpgf"; + sha256 = "1sgz8gri51i2pxnzzkcvwx5ncw1rjz7ain82hlcx6f3874qfsniy"; }; - patches = [ ./fix-shell-path.patch ]; - - postInstall = '' - install -d $out/bin/helper-images - ln -sf ${docker_x86_64} $out/bin/helper-images/prebuilt-x86_64.tar.xz - ln -sf ${docker_arm} $out/bin/helper-images/prebuilt-arm.tar.xz - ''; + patches = [ + ./fix-shell-path.patch + ./0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch + ]; meta = with lib; { description = "GitLab Runner the continuous integration executor of GitLab"; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch index 8aa419ea5f94..4a3d37be09cd 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch @@ -1,28 +1,25 @@ diff --git a/shells/bash.go b/shells/bash.go -index 673f4765..a58cc5e2 100644 +index bd99eca1a..9873dff6b 100644 --- a/shells/bash.go +++ b/shells/bash.go -@@ -5,6 +5,7 @@ import ( +@@ -3,6 +3,7 @@ package shells + import ( "bytes" "fmt" - "io" + "os/exec" "path" "runtime" "strconv" -@@ -225,7 +226,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo +@@ -300,7 +301,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (*common.Shell if info.User != "" { script.Command = "su" if runtime.GOOS == "linux" { - script.Arguments = append(script.Arguments, "-s", "/bin/"+b.Shell) + shellPath, err := exec.LookPath(b.Shell) + if err != nil { -+ shellPath = "/bin/"+b.Shell ++ shellPath = "/bin/" + b.Shell + } + script.Arguments = append(script.Arguments, "-s", shellPath) } - script.Arguments = append(script.Arguments, info.User) - script.Arguments = append(script.Arguments, "-c", shellCommand) --- -2.18.0 - + script.Arguments = append( + script.Arguments, diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix index dfca0c4d388e..5c0c59845ce6 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/hci/default.nix @@ -1,13 +1,12 @@ { haskell, haskellPackages, lib, makeWrapper, runc, stdenv }: let - inherit (haskell.lib) overrideCabal addBuildDepends; + inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables; inherit (lib) makeBinPath; bundledBins = lib.optional stdenv.isLinux runc; pkg = # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 overrideCabal - (addBuildDepends (haskell.lib.justStaticExecutables haskellPackages.hercules-ci-cli) [ makeWrapper ]) (o: { postInstall = '' ${o.postInstall or ""} @@ -15,7 +14,8 @@ let mv $out/bin/hci $out/libexec makeWrapper $out/libexec/hci $out/bin/hci --prefix PATH : ${makeBinPath bundledBins} ''; - }); + }) + (addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-cli)); in pkg // { meta = pkg.meta // { position = toString ./default.nix + ":1"; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix index bc464c2024e4..00ae501e5348 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -1,13 +1,12 @@ { gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper, nixos, runc, stdenv }: let - inherit (haskell.lib) overrideCabal addBuildDepends; + inherit (haskell.lib.compose) overrideCabal addBuildDepends justStaticExecutables; inherit (lib) makeBinPath; bundledBins = [ gnutar gzip git ] ++ lib.optional stdenv.isLinux runc; pkg = # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 overrideCabal - (addBuildDepends (haskell.lib.justStaticExecutables haskellPackages.hercules-ci-agent) [ makeWrapper ]) (o: { postInstall = '' ${o.postInstall or ""} @@ -15,7 +14,8 @@ let mv $out/bin/hercules-ci-agent $out/libexec makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath bundledBins} ''; - }); + }) + (addBuildDepends [ makeWrapper ] (justStaticExecutables haskellPackages.hercules-ci-agent)); in pkg.overrideAttrs (o: { meta = o.meta // { position = toString ./default.nix + ":1"; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index a7d9aeda000b..65132b72391e 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.303.1"; + version = "2.319.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0rf06axz1hxssg942w2g66avak30jy6rfdwxynhriqv3vrf17bja"; + sha256 = "0qm562v7jwc9mjpbn1f808kg97axy1mraq3s5h679niffn588jvy"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix index 8d06ff94a032..05f96c0695b6 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchFromGitHub , cmake , capnproto , sqlite @@ -14,14 +15,9 @@ let url = "https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js"; sha256 = "1hm5kci2g6n5ikrvp1kpkkdzimjgylv1xicg2vnkbvd9rb56qa99"; }; - js.vue-router = fetchurl { - url = - "https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.4.8/vue-router.min.js"; - sha256 = "0418waib896ywwxkxliip75zp94k3s9wld51afrqrcq70axld0c9"; - }; js.ansi_up = fetchurl { - url = "https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js"; - sha256 = "1993dywxqi2ylnxybwk7m0s0bg2bq7kfllpyr0s8ck6chd0p8i6r"; + url = "https://raw.githubusercontent.com/drudru/ansi_up/v4.0.4/ansi_up.js"; + sha256 = "1dx8wn38ds8d01kkih26fx1yrisg3kpz61qynjr4zil03ap0hrlr"; }; js.Chart = fetchurl { url = "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js"; @@ -29,10 +25,12 @@ let }; in stdenv.mkDerivation rec { pname = "laminar"; - version = "1.0"; - src = fetchurl { - url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz"; - sha256 = "11m6h3rdmj2rsmsryy7r40gqccj4gg1cnqwy6blscs87gx4s423g"; + version = "1.1"; + src = fetchFromGitHub { + owner = "ohwgiles"; + repo = "laminar"; + rev = version; + sha256 = "sha256-9JiFO5Vi/NT/o7v/KXZw3/P5s5qQwmQXjrQq+uUXHQk="; }; patches = [ ./patches/no-network.patch ]; nativeBuildInputs = [ cmake pandoc ]; @@ -40,7 +38,6 @@ in stdenv.mkDerivation rec { preBuild = '' mkdir -p js css cp ${js.vue} js/vue.min.js - cp ${js.vue-router} js/vue-router.min.js cp ${js.ansi_up} js/ansi_up.js cp ${js.Chart} js/Chart.min.js ''; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch b/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch index 355baeb837a5..33683fdb1519 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch +++ b/nixpkgs/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch @@ -4,25 +4,23 @@ does so unconditionally is twice as bad. Required files are downloaded as separate fixed-output derivations and put into correct location before build phase starts. ---- laminar-0.8/CMakeLists.txt -+++ laminar-0.8-new/CMakeLists.txt -@@ -82,15 +82,6 @@ +--- laminar-1.1/CMakeLists.txt ++++ laminar-1.1-new/CMakeLists.txt +@@ -82,13 +82,6 @@ COMMAND sh -c '( echo -n "\\#define INDEX_HTML_UNCOMPRESSED_SIZE " && wc -c < "${CMAKE_SOURCE_DIR}/src/resources/index.html" ) > index_html_size.h' DEPENDS src/resources/index.html) -# Download 3rd-party frontend JS libs... -file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js - js/vue.min.js EXPECTED_MD5 fb192338844efe86ec759a40152fcb8e) --file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.4.8/vue-router.min.js -- js/vue-router.min.js EXPECTED_MD5 5f51d4dbbf68fd6725956a5a2b865f3b) --file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js -- js/ansi_up.js EXPECTED_MD5 158566dc1ff8f2804de972f7e841e2f6) +-file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v4.0.4/ansi_up.js +- js/ansi_up.js EXPECTED_MD5 b31968e1a8fed0fa82305e978161f7f5) -file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js - js/Chart.min.js EXPECTED_MD5 f6c8efa65711e0cbbc99ba72997ecd0e) # ...and compile them - generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue-router.min.js js/vue.min.js + generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue.min.js js/ansi_up.js js/Chart.min.js) -@@ -141,12 +132,12 @@ +@@ -139,12 +132,12 @@ target_link_libraries(laminar-tests ${GTEST_LIBRARY} capnp-rpc capnp kj-http kj-async kj pthread sqlite3 z) endif() |