From 82c23e86fed4488fb792be32c35999ac1bb46c61 Mon Sep 17 00:00:00 2001 From: ecrupper Date: Wed, 14 Jun 2023 11:47:30 -0500 Subject: [PATCH 1/7] chore(deps): upgrade dependencies, workflows, and alpine image --- .github/workflows/build.yml | 11 +++++++++-- .github/workflows/prerelease.yml | 15 +++++++++++---- .github/workflows/publish.yml | 15 +++++++++++---- .github/workflows/reviewdog.yml | 22 ++++++++++++++++++---- .github/workflows/test.yml | 15 +++++++++++---- .github/workflows/validate.yml | 11 +++++++++-- Dockerfile.scp | 2 +- Dockerfile.ssh | 2 +- go.mod | 10 +++++----- go.sum | 23 ++++++++++++++--------- 10 files changed, 90 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4e769fc..bdbb9a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,12 +10,19 @@ on: jobs: build: runs-on: ubuntu-latest - container: - image: golang:1.18 + steps: - name: clone uses: actions/checkout@v3 + - name: install go + uses: actions/setup-go@v4 + with: + # use version from go.mod file + go-version-file: 'go.mod' + cache: true + check-latest: true + - name: build run: | make build diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 34cd858..376373d 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -11,8 +11,7 @@ on: jobs: prerelease: runs-on: ubuntu-latest - container: - image: golang:1.18 + steps: - name: clone uses: actions/checkout@v3 @@ -20,6 +19,14 @@ jobs: # ensures we fetch tag history for the repository fetch-depth: 0 + - name: install go + uses: actions/setup-go@v4 + with: + # use version from go.mod file + go-version-file: 'go.mod' + cache: true + check-latest: true + - name: setup run: | # setup git tag in Actions environment @@ -38,7 +45,7 @@ jobs: grep "^SSHPASS_VERSION.*=" Makefile >> $GITHUB_ENV - name: publish scp - uses: elgohr/Publish-Docker-Github-Action@master + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: target/vela-scp cache: true @@ -49,7 +56,7 @@ jobs: buildargs: OPENSSH_VERSION,SSHPASS_VERSION - name: publish ssh - uses: elgohr/Publish-Docker-Github-Action@master + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: target/vela-ssh cache: true diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 90293ca..5461a8b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,8 +10,7 @@ on: jobs: publish: runs-on: ubuntu-latest - container: - image: golang:1.18 + steps: - name: clone uses: actions/checkout@v3 @@ -19,6 +18,14 @@ jobs: # ensures we fetch tag history for the repository fetch-depth: 0 + - name: install go + uses: actions/setup-go@v4 + with: + # use version from go.mod file + go-version-file: 'go.mod' + cache: true + check-latest: true + - name: build env: GOOS: linux @@ -32,7 +39,7 @@ jobs: grep "^SSHPASS_VERSION.*=" Makefile >> $GITHUB_ENV - name: publish scp - uses: elgohr/Publish-Docker-Github-Action@master + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: target/vela-scp cache: true @@ -42,7 +49,7 @@ jobs: buildargs: OPENSSH_VERSION,SSHPASS_VERSION - name: publish ssh - uses: elgohr/Publish-Docker-Github-Action@master + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: target/vela-ssh cache: true diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml index d580eb2..0a0027c 100644 --- a/.github/workflows/reviewdog.yml +++ b/.github/workflows/reviewdog.yml @@ -9,12 +9,19 @@ on: jobs: diff-review: runs-on: ubuntu-latest - container: - image: golang:1.18 + steps: - name: clone uses: actions/checkout@v3 + - name: install go + uses: actions/setup-go@v4 + with: + # use version from go.mod file + go-version-file: 'go.mod' + cache: true + check-latest: true + - name: golangci-lint uses: reviewdog/action-golangci-lint@v2 with: @@ -26,12 +33,19 @@ jobs: full-review: runs-on: ubuntu-latest - container: - image: golang:1.18 + steps: - name: clone uses: actions/checkout@v3 + - name: install go + uses: actions/setup-go@v4 + with: + # use version from go.mod file + go-version-file: 'go.mod' + cache: true + check-latest: true + - name: golangci-lint uses: reviewdog/action-golangci-lint@v2 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b576f3f..0474649 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,12 +10,19 @@ on: jobs: unit-test: runs-on: ubuntu-latest - container: - image: golang:1.18 + steps: - name: clone uses: actions/checkout@v3 + - name: install go + uses: actions/setup-go@v4 + with: + # use version from go.mod file + go-version-file: 'go.mod' + cache: true + check-latest: true + - name: test run: | go test -covermode=atomic -coverprofile=coverage.out ./... @@ -71,7 +78,7 @@ jobs: grep "^SSHPASS_VERSION.*=" Makefile >> $GITHUB_ENV - name: publish scp - uses: elgohr/Publish-Docker-Github-Action@master + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: target/vela-scp cache: true @@ -81,7 +88,7 @@ jobs: buildargs: OPENSSH_VERSION,SSHPASS_VERSION - name: publish ssh - uses: elgohr/Publish-Docker-Github-Action@master + uses: elgohr/Publish-Docker-Github-Action@v5 with: name: target/vela-ssh cache: true diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 79e58f3..aaa32bf 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -10,12 +10,19 @@ on: jobs: validate: runs-on: ubuntu-latest - container: - image: golang:1.18 + steps: - name: clone uses: actions/checkout@v3 + - name: install go + uses: actions/setup-go@v4 + with: + # use version from go.mod file + go-version-file: 'go.mod' + cache: true + check-latest: true + - name: validate run: | # Check that go mod tidy produces a zero diff; clean up any changes afterwards. diff --git a/Dockerfile.scp b/Dockerfile.scp index be09b7a..2e25e4f 100644 --- a/Dockerfile.scp +++ b/Dockerfile.scp @@ -6,7 +6,7 @@ ## docker build --no-cache -t vela-scp:local . ## ############################################################### -FROM alpine:3.16@sha256:bc41182d7ef5ffc53a40b044e725193bc10142a1243f395ee852a8d9730fc2ad +FROM alpine:3.18@sha256:02bb6f428431fbc2809c5d1b41eab5a68350194fb508869a33cb1af4444c9b11 # Build args to be used from the Makefile ARG OPENSSH_VERSION diff --git a/Dockerfile.ssh b/Dockerfile.ssh index 695660a..2c3fb3a 100644 --- a/Dockerfile.ssh +++ b/Dockerfile.ssh @@ -6,7 +6,7 @@ ## docker build --no-cache -t vela-ssh:local . ## ############################################################### -FROM alpine:3.16@sha256:bc41182d7ef5ffc53a40b044e725193bc10142a1243f395ee852a8d9730fc2ad +FROM alpine:3.18@sha256:02bb6f428431fbc2809c5d1b41eab5a68350194fb508869a33cb1af4444c9b11 # Build args to be used from the Makefile ARG OPENSSH_VERSION diff --git a/go.mod b/go.mod index 7b6f76e..ab5c553 100644 --- a/go.mod +++ b/go.mod @@ -3,15 +3,15 @@ module github.com/go-vela/vela-openssh go 1.18 require ( - github.com/sirupsen/logrus v1.9.0 - github.com/spf13/afero v1.9.2 - github.com/urfave/cli/v2 v2.11.2 + github.com/sirupsen/logrus v1.9.3 + github.com/spf13/afero v1.9.5 + github.com/urfave/cli/v2 v2.25.6 ) require ( github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect - golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect - golang.org/x/text v0.3.7 // indirect + golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect + golang.org/x/text v0.3.8 // indirect ) diff --git a/go.sum b/go.sum index e6ae84b..9441b19 100644 --- a/go.sum +++ b/go.sum @@ -133,17 +133,17 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= -github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= +github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/urfave/cli/v2 v2.11.2 h1:FVfNg4m3vbjbBpLYxW//WjxUoHvJ9TlppXcqY9Q9ZfA= -github.com/urfave/cli/v2 v2.11.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo= +github.com/urfave/cli/v2 v2.25.6 h1:yuSkgDSZfH3L1CjF2/5fNNg2KbM47pY2EvjBq4ESQnU= +github.com/urfave/cli/v2 v2.25.6/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -162,7 +162,7 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -227,6 +227,7 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -278,10 +279,12 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -289,8 +292,10 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From c61b0c9dee7eba13983da35b815f5f6c6524083d Mon Sep 17 00:00:00 2001 From: ecrupper Date: Wed, 14 Jun 2023 12:00:04 -0500 Subject: [PATCH 2/7] upgrade go --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ab5c553..0db9cf5 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/go-vela/vela-openssh -go 1.18 +go 1.20 require ( github.com/sirupsen/logrus v1.9.3 From bbcd01aadbd05fa4905e38570046ad6329f81c36 Mon Sep 17 00:00:00 2001 From: ecrupper Date: Thu, 15 Jun 2023 12:12:56 -0500 Subject: [PATCH 3/7] update ssh and openssh versions --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 00f5797..9b889eb 100644 --- a/Makefile +++ b/Makefile @@ -8,9 +8,9 @@ # the integration tests, and the static build flags for Go. # Note: No space between the equals and the value else issues arise. # renovate: datasource=repology depName=alpine_3_16/openssh versioning=loose -OPENSSH_VERSION=9.0_p1-r2 +OPENSSH_VERSION=9.3_p1-r3 # renovate: datasource=repology depName=alpine_3_16/sshpass versioning=loose -SSHPASS_VERSION=1.09-r0 +SSHPASS_VERSION=1.10-r0 # check if a git tag is already set ifndef GITHUB_TAG From a51b0131d165791cc76f0677db3cb7974f0bfd4c Mon Sep 17 00:00:00 2001 From: ecrupper Date: Thu, 15 Jun 2023 12:17:57 -0500 Subject: [PATCH 4/7] server openssh version upgrade --- test/Dockerfile.ssh-server | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/Dockerfile.ssh-server b/test/Dockerfile.ssh-server index 3ec0725..23c721d 100644 --- a/test/Dockerfile.ssh-server +++ b/test/Dockerfile.ssh-server @@ -1,9 +1,9 @@ FROM alpine:3.16@sha256:bc41182d7ef5ffc53a40b044e725193bc10142a1243f395ee852a8d9730fc2ad -# renovate: datasource=repology depName=alpine_3_16/openssh versioning=loose -ENV OPENSSH_VERSION=9.0_p1-r2 -# renovate: datasource=repology depName=alpine_3_16/openssh-sftp-server versioning=loose -ENV OPENSSH_SFTP_SERVER_VERSION=9.0_p1-r2 +# renovate: datasource=repology depName=alpine_3_18/openssh versioning=loose +ENV OPENSSH_VERSION=9.3_p1-r3 +# renovate: datasource=repology depName=alpine_3_18/openssh-sftp-server versioning=loose +ENV OPENSSH_SFTP_SERVER_VERSION=9.3_p1-r3 RUN apk add openssh=${OPENSSH_VERSION} openssh-sftp-server=${OPENSSH_SFTP_SERVER_VERSION} && \ adduser -D vela -h /home/vela && \ From 7e5d7c7c7439e42fe1139b15c3422e17bdcef576 Mon Sep 17 00:00:00 2001 From: ecrupper Date: Thu, 15 Jun 2023 12:18:49 -0500 Subject: [PATCH 5/7] alpine 3.18 --- test/Dockerfile.ssh-server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Dockerfile.ssh-server b/test/Dockerfile.ssh-server index 23c721d..a46ae3a 100644 --- a/test/Dockerfile.ssh-server +++ b/test/Dockerfile.ssh-server @@ -1,4 +1,4 @@ -FROM alpine:3.16@sha256:bc41182d7ef5ffc53a40b044e725193bc10142a1243f395ee852a8d9730fc2ad +FROM alpine:3.18@sha256:02bb6f428431fbc2809c5d1b41eab5a68350194fb508869a33cb1af4444c9b11 # renovate: datasource=repology depName=alpine_3_18/openssh versioning=loose ENV OPENSSH_VERSION=9.3_p1-r3 From 992d8e60df95f11ac73143648a241b15b6a42118 Mon Sep 17 00:00:00 2001 From: ecrupper Date: Mon, 26 Jun 2023 15:01:45 -0500 Subject: [PATCH 6/7] give this a try --- .github/workflows/test.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0474649..facbcb2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,7 +43,7 @@ jobs: uses: actions/checkout@v3 - name: build for integration test - uses: docker://golang:1.18 + uses: docker://golang:1.20 with: entrypoint: make args: build-static-ci @@ -56,8 +56,7 @@ jobs: gha-publish-test: runs-on: ubuntu-latest - container: - image: golang:1.18 + steps: - name: clone uses: actions/checkout@v3 @@ -65,6 +64,14 @@ jobs: # ensures we fetch tag history for the repository fetch-depth: 0 + - name: install go + uses: actions/setup-go@v4 + with: + # use version from go.mod file + go-version-file: 'go.mod' + cache: true + check-latest: true + - name: build env: GOOS: linux From 93ecbc6912fa2ca3f5c601ec9b9e971f7e4b3f71 Mon Sep 17 00:00:00 2001 From: ecrupper Date: Mon, 26 Jun 2023 15:06:00 -0500 Subject: [PATCH 7/7] pls --- .github/workflows/test.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index facbcb2..4640e5e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,14 +42,19 @@ jobs: - name: checkout uses: actions/checkout@v3 - - name: build for integration test - uses: docker://golang:1.20 + - name: install go + uses: actions/setup-go@v4 with: - entrypoint: make - args: build-static-ci + # use version from go.mod file + go-version-file: 'go.mod' + cache: true + check-latest: true + + - name: build for integration test env: GOOS: linux CGO_ENABLED: '0' + run: make build-static-ci - name: integration test with fake server run: make docker-build && make docker-test