mirror of
https://github.com/dutchcoders/transfer.sh.git
synced 2024-12-25 11:50:18 +01:00
Check ci 20241026 (#632)
* bump go version and se gotip * bump go version and se gotip * bump go version and se gotip * bump go version and se gotip * linting * gobin * GOPATH
This commit is contained in:
parent
7f043ca543
commit
089ff324e1
4 changed files with 21 additions and 18 deletions
24
.github/workflows/test.yml
vendored
24
.github/workflows/test.yml
vendored
|
@ -13,9 +13,9 @@ jobs:
|
|||
fail-fast: false
|
||||
matrix:
|
||||
go_version:
|
||||
- '1.18'
|
||||
- '1.19'
|
||||
- '1.20'
|
||||
- '1.21'
|
||||
- '1.22'
|
||||
- '1.23'
|
||||
- tip
|
||||
name: Test with ${{ matrix.go_version }}
|
||||
steps:
|
||||
|
@ -29,16 +29,20 @@ jobs:
|
|||
- name: Install Go ${{ matrix.go_version }}
|
||||
if: ${{ matrix.go_version == 'tip' }}
|
||||
run: |
|
||||
curl -sL https://storage.googleapis.com/go-build-snap/go/linux-amd64/$(git ls-remote https://github.com/golang/go.git HEAD | awk '{print $1;}').tar.gz -o gotip.tar.gz
|
||||
ls -lah gotip.tar.gz
|
||||
mkdir -p ~/sdk/gotip
|
||||
tar -C ~/sdk/gotip -xzf gotip.tar.gz
|
||||
echo "PATH=$HOME/go/bin:$HOME/sdk/gotip/bin/:$PATH" >> $GITHUB_ENV
|
||||
- name: Vet and test
|
||||
go install golang.org/dl/gotip@latest
|
||||
`go env GOPATH`/bin/gotip download
|
||||
- name: Vet and test no tip
|
||||
if: ${{ matrix.go_version != 'tip' }}
|
||||
run: |
|
||||
go version
|
||||
go vet ./...
|
||||
go test ./...
|
||||
- name: Vet and test gotip
|
||||
if: ${{ matrix.go_version == 'tip' }}
|
||||
run: |
|
||||
`go env GOPATH`/bin/gotip version
|
||||
`go env GOPATH`/bin/gotip vet ./...
|
||||
`go env GOPATH`/bin/gotip test ./...
|
||||
golangci:
|
||||
name: Linting
|
||||
runs-on: ubuntu-latest
|
||||
|
@ -46,7 +50,7 @@ jobs:
|
|||
- uses: actions/checkout@v2
|
||||
- uses: actions/setup-go@master
|
||||
with:
|
||||
go-version: '1.20'
|
||||
go-version: '1.23'
|
||||
check-latest: true
|
||||
- name: golangci-lint
|
||||
uses: golangci/golangci-lint-action@v2
|
||||
|
|
|
@ -26,7 +26,7 @@ func (s *suiteRedirectWithForceHTTPS) SetUpTest(c *C) {
|
|||
c.Assert(err, IsNil)
|
||||
|
||||
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
fmt.Fprintln(w, "Hello, client")
|
||||
_, _ = fmt.Fprintln(w, "Hello, client")
|
||||
})
|
||||
|
||||
s.handler = srvr.RedirectHandler(handler)
|
||||
|
@ -83,7 +83,7 @@ func (s *suiteRedirectWithoutForceHTTPS) SetUpTest(c *C) {
|
|||
c.Assert(err, IsNil)
|
||||
|
||||
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
fmt.Fprintln(w, "Hello, client")
|
||||
_, _ = fmt.Fprintln(w, "Hello, client")
|
||||
})
|
||||
|
||||
s.handler = srvr.RedirectHandler(handler)
|
||||
|
|
|
@ -402,12 +402,15 @@ func New(options ...OptionFn) (*Server, error) {
|
|||
return s, nil
|
||||
}
|
||||
|
||||
var theRand *rand.Rand
|
||||
|
||||
func init() {
|
||||
var seedBytes [8]byte
|
||||
if _, err := cryptoRand.Read(seedBytes[:]); err != nil {
|
||||
panic("cannot obtain cryptographically secure seed")
|
||||
}
|
||||
rand.Seed(int64(binary.LittleEndian.Uint64(seedBytes[:])))
|
||||
|
||||
theRand = rand.New(rand.NewSource(int64(binary.LittleEndian.Uint64(seedBytes[:]))))
|
||||
}
|
||||
|
||||
// Run starts Server
|
||||
|
|
|
@ -24,10 +24,6 @@ THE SOFTWARE.
|
|||
|
||||
package server
|
||||
|
||||
import (
|
||||
"math/rand"
|
||||
)
|
||||
|
||||
const (
|
||||
// SYMBOLS characters used for short-urls
|
||||
SYMBOLS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
|
@ -37,7 +33,7 @@ const (
|
|||
func token(length int) string {
|
||||
result := ""
|
||||
for i := 0; i < length; i++ {
|
||||
x := rand.Intn(len(SYMBOLS) - 1)
|
||||
x := theRand.Intn(len(SYMBOLS) - 1)
|
||||
result = string(SYMBOLS[x]) + result
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue