From 5cf1fd2034640e0466ac65dc0ec73056b837fab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Buchwald?= Date: Sun, 16 Jul 2023 14:03:58 -0300 Subject: [PATCH 1/9] test --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0cf3ec7..6c143ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,8 @@ ENV GOROOT /usr/lib/go ENV GOPATH /go ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH -RUN grep '^[^ #]' /tmp/goimports.txt | xargs go get && rm -rf /tmp/goimports.txt && go mod tidy && rm -rf /go.mod +RUN grep '^[^ #]' /tmp/goimports.txt | xargs go get && rm -rf /tmp/goimports.txt +RUN go mod tidy && rm -rf /go.mod # TODO: cambiar a $INPUT_PATH antes de correr $INPUT_COMMAND. ENTRYPOINT ["/bin/sh", "-c"] From c21d10d6978a9a0247e93a4d779fa66e8abbceb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Buchwald?= Date: Sun, 16 Jul 2023 14:28:12 -0300 Subject: [PATCH 2/9] updates --- Dockerfile | 2 +- goimports.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6c143ef..f4163dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ ENV GOPATH /go ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH RUN grep '^[^ #]' /tmp/goimports.txt | xargs go get && rm -rf /tmp/goimports.txt -RUN go mod tidy && rm -rf /go.mod +RUN mkdir /dwnlds && mv /go.mod /dwnlds && cd /dwnlds && go mod tidy && cd / && rm -rf /dwnlds # TODO: cambiar a $INPUT_PATH antes de correr $INPUT_COMMAND. ENTRYPOINT ["/bin/sh", "-c"] diff --git a/goimports.txt b/goimports.txt index a381470..1750226 100644 --- a/goimports.txt +++ b/goimports.txt @@ -3,4 +3,4 @@ github.com/pmezard/go-difflib@v1.0.0 github.com/stretchr/objx@v0.5.0 gopkg.in/yaml.v3@v3.0.1 gopkg.in/check.v1@v0.0.0-20161208181325-20d25e280405 -github.com/stretchr/testify@latest +github.com/stretchr/testify@1.8.4 From b260dadef671f20f4880aa7c99eae9a750013c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Buchwald?= Date: Sun, 16 Jul 2023 14:32:29 -0300 Subject: [PATCH 3/9] fixup --- goimports.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/goimports.txt b/goimports.txt index 1750226..69ebf7a 100644 --- a/goimports.txt +++ b/goimports.txt @@ -3,4 +3,4 @@ github.com/pmezard/go-difflib@v1.0.0 github.com/stretchr/objx@v0.5.0 gopkg.in/yaml.v3@v3.0.1 gopkg.in/check.v1@v0.0.0-20161208181325-20d25e280405 -github.com/stretchr/testify@1.8.4 +github.com/stretchr/testify@v1.8.4 From 784ccf7c69b9aceb71910a30ef3f6add8f78b291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Buchwald?= Date: Sun, 16 Jul 2023 14:39:45 -0300 Subject: [PATCH 4/9] generate --- .github/workflows/docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index d258d81..2450bab 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -5,7 +5,7 @@ on: - Dockerfile - packages.txt - .github/workflows/docker.yaml - branches: [v3] + branches: [v3, test] pull_request: branches: [v3] jobs: From 7e322437a6708f81003848384b46c5eefbd44260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Buchwald?= Date: Sun, 16 Jul 2023 14:50:07 -0300 Subject: [PATCH 5/9] probamos mod 1.20 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 420d3f1..b8278b1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module install -go 1.19 +go 1.20 require github.com/stretchr/testify v1.8.4 From bfeb4e93797bedb34f446f8a3a47e7d1226e3804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Buchwald?= Date: Sun, 16 Jul 2023 14:54:04 -0300 Subject: [PATCH 6/9] Prueba ejecutando tests para traer dependencias --- Dockerfile | 3 ++- u_test.go | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 u_test.go diff --git a/Dockerfile b/Dockerfile index f4163dc..9668912 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ FROM ubuntu:focal ADD packages.txt /tmp ADD goimports.txt /tmp ADD go.mod / +ADD u_test.go / ADD nodejs.list /etc/apt/sources.list.d ADD nodesource.gpg.asc /etc/apt/trusted.gpg.d ENV DEBIAN_FRONTEND noninteractive @@ -20,7 +21,7 @@ ENV GOPATH /go ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH RUN grep '^[^ #]' /tmp/goimports.txt | xargs go get && rm -rf /tmp/goimports.txt -RUN mkdir /dwnlds && mv /go.mod /dwnlds && cd /dwnlds && go mod tidy && cd / && rm -rf /dwnlds +RUN mkdir /dwnlds && mv /go.mod /dwnlds && mv /u_test.go /dwnlds && cd /dwnlds && go mod tidy && go test u_test.go && cd / && rm -rf /dwnlds # TODO: cambiar a $INPUT_PATH antes de correr $INPUT_COMMAND. ENTRYPOINT ["/bin/sh", "-c"] diff --git a/u_test.go b/u_test.go new file mode 100644 index 0000000..d1bb75c --- /dev/null +++ b/u_test.go @@ -0,0 +1,13 @@ +package install + +import ( + "testing" + + "github.com/stretchr/testify/require" +) + +func TestCosa(t *testing.T) { + b := 10 + require.EqualValues(t, 10, b) +} + From 54912b6c586992314c301252d0ee4d5b095363dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Buchwald?= Date: Sun, 16 Jul 2023 15:03:40 -0300 Subject: [PATCH 7/9] move --- Dockerfile | 1 + goimports.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9668912..8682369 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ ENV GOPATH /go ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH RUN grep '^[^ #]' /tmp/goimports.txt | xargs go get && rm -rf /tmp/goimports.txt + RUN mkdir /dwnlds && mv /go.mod /dwnlds && mv /u_test.go /dwnlds && cd /dwnlds && go mod tidy && go test u_test.go && cd / && rm -rf /dwnlds # TODO: cambiar a $INPUT_PATH antes de correr $INPUT_COMMAND. diff --git a/goimports.txt b/goimports.txt index 69ebf7a..6b7a449 100644 --- a/goimports.txt +++ b/goimports.txt @@ -2,5 +2,5 @@ github.com/davecgh/go-spew@v1.1.1 github.com/pmezard/go-difflib@v1.0.0 github.com/stretchr/objx@v0.5.0 gopkg.in/yaml.v3@v3.0.1 -gopkg.in/check.v1@v0.0.0-20161208181325-20d25e280405 +gopkg.in/check.v1@v1.0.0-20201130134442-10cb98267c6c github.com/stretchr/testify@v1.8.4 From 6aad4acfeb103ca11ca6ec540ac6c33f0251e3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Buchwald?= Date: Sun, 16 Jul 2023 15:45:01 -0300 Subject: [PATCH 8/9] reupdate --- .github/workflows/docker.yaml | 1 + Dockerfile | 5 +---- u_test.go | 13 ------------- 3 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 u_test.go diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 2450bab..ba6c921 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -4,6 +4,7 @@ on: paths: - Dockerfile - packages.txt + - goimports.txt - .github/workflows/docker.yaml branches: [v3, test] pull_request: diff --git a/Dockerfile b/Dockerfile index 8682369..3ecb4a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,6 @@ FROM ubuntu:focal ADD packages.txt /tmp ADD goimports.txt /tmp ADD go.mod / -ADD u_test.go / ADD nodejs.list /etc/apt/sources.list.d ADD nodesource.gpg.asc /etc/apt/trusted.gpg.d ENV DEBIAN_FRONTEND noninteractive @@ -20,9 +19,7 @@ ENV GOROOT /usr/lib/go ENV GOPATH /go ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH -RUN grep '^[^ #]' /tmp/goimports.txt | xargs go get && rm -rf /tmp/goimports.txt - -RUN mkdir /dwnlds && mv /go.mod /dwnlds && mv /u_test.go /dwnlds && cd /dwnlds && go mod tidy && go test u_test.go && cd / && rm -rf /dwnlds +RUN grep '^[^ #]' /tmp/goimports.txt | xargs go get && rm -rf /tmp/goimports.txt && rm /go.mod # TODO: cambiar a $INPUT_PATH antes de correr $INPUT_COMMAND. ENTRYPOINT ["/bin/sh", "-c"] diff --git a/u_test.go b/u_test.go deleted file mode 100644 index d1bb75c..0000000 --- a/u_test.go +++ /dev/null @@ -1,13 +0,0 @@ -package install - -import ( - "testing" - - "github.com/stretchr/testify/require" -) - -func TestCosa(t *testing.T) { - b := 10 - require.EqualValues(t, 10, b) -} - From 511f47d73b7927d0af619c4bae2ddc2035053d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Buchwald?= Date: Sun, 16 Jul 2023 15:54:17 -0300 Subject: [PATCH 9/9] reupdate --- .github/workflows/docker.yaml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index ba6c921..cac6f5e 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -6,7 +6,7 @@ on: - packages.txt - goimports.txt - .github/workflows/docker.yaml - branches: [v3, test] + branches: [v3] pull_request: branches: [v3] jobs: diff --git a/Dockerfile b/Dockerfile index 3ecb4a6..84bbdaf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ ENV GOROOT /usr/lib/go ENV GOPATH /go ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH -RUN grep '^[^ #]' /tmp/goimports.txt | xargs go get && rm -rf /tmp/goimports.txt && rm /go.mod +RUN grep '^[^ #]' /tmp/goimports.txt | xargs go get && rm -rf /tmp/goimports.txt && rm -rf /go.mod # TODO: cambiar a $INPUT_PATH antes de correr $INPUT_COMMAND. ENTRYPOINT ["/bin/sh", "-c"]