From c1796ee9ca411ec9ed213c1e6eb217ccb466fcf5 Mon Sep 17 00:00:00 2001 From: Matthew Jaffee Date: Thu, 9 Sep 2021 14:12:39 -0500 Subject: [PATCH] update test matrices and remove COPY lines COPY lines in Dockerfile were backported from 3.x where we have package.json and yarn.lock checked in directly. In 2.x we're pulling in lattice as a submodule and it does not have those... I think this means that versions of dependencies aren't necessarily pinned, but given that Q2 isn't heavily dependent on the UI this should be OK. --- .circleci/config.yml | 4 ++-- Dockerfile | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9ab36decd..7cf4a8b16 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -226,7 +226,7 @@ workflows: - setup matrix: parameters: - golang_version: ["1.14.12", "1.15.5"] + golang_version: ["1.16.7"] - test: name: << matrix.test_make_target >> resource_class: xlarge @@ -235,7 +235,7 @@ workflows: - setup matrix: parameters: - test_make_target: ["test-race", "test-txstore-rbf", "test-txstore-rbf_bolt"] + test_make_target: ["test-race"] - test: name: test-shardwidth-22 shard_width: "22" diff --git a/Dockerfile b/Dockerfile index 20170e420..fed4ef58b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,6 @@ ARG GO_VERSION=latest FROM moleculacorp/nodejs:latest as lattice-builder WORKDIR /lattice -COPY lattice/package.json ./ -COPY lattice/yarn.lock ./ RUN yarn install COPY lattice ./