justan0th3rstud3nt
/
garble
mirror of https://github.com/burrowers/garble
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

drop support for Go 1.19

Browse Source 
Now that we're done with garble v0.9.x,
v0.10 will only support Go 1.20 as a minimum version.
pull/680/head
Daniel Martí 2 years ago
parent 9a8608f061
commit b322876efe
32 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File

2
.github/workflows/test.yml vendored
Unescape Escape View File

@ -22,7 +22,7 @@ jobs:
test:
strategy:
matrix:
go-version: [1.19.x, 1.20.x]
go-version: [1.20.x]
# TODO: revert to macos-latest once we figure out https://github.com/burrowers/garble/issues/609.
os: [ubuntu-latest, macos-11, windows-latest]
runs-on: ${{ matrix.os }}

2
README.md
Unescape Escape View File

@ -2,7 +2,7 @@
go install mvdan.cc/garble@latest
Obfuscate Go code by wrapping the Go toolchain. Requires Go 1.19 or later.
Obfuscate Go code by wrapping the Go toolchain. Requires Go 1.20 or later.
garble build [build flags] [packages]

2
go.mod
Unescape Escape View File

@ -1,6 +1,6 @@
module mvdan.cc/garble
go 1.19
go 1.20
require (
github.com/bluekeyes/go-gitdiff v0.7.0

2
main.go
Unescape Escape View File

@ -262,7 +262,7 @@ var toolchainVersionSemver string
func goVersionOK() bool {
const (
minGoVersionSemver = "v1.19.0"
minGoVersionSemver = "v1.20.0"
suggestedGoVersion = "1.20.x"
)

2
testdata/script/asm.txtar vendored
Unescape Escape View File

@ -33,7 +33,7 @@ binsubstr main$exe 'addJmp' 'AddImpl'
-- go.mod --
module test/with.many.dots/main
go 1.19
go 1.20
-- main.go --
package main

2
testdata/script/basic.txtar vendored
Unescape Escape View File

@ -59,7 +59,7 @@ binsubstr main$exe 'garble_main.go' 'globalVar' 'globalFunc' $gofullversion
-- go.mod --
module test/mainfoo
go 1.19
go 1.20
-- garble_main.go --
package main

2
testdata/script/cgo.txtar vendored
Unescape Escape View File

@ -29,7 +29,7 @@ binsubstr main$exe 'privateAdd'
-- go.mod --
module test/main
go 1.19
go 1.20
-- main.go --
package main

3
testdata/script/crossbuild.txtar vendored
Unescape Escape View File

@ -18,11 +18,10 @@
[arm] env GOARCH=arm64
garble build -gcflags=math/bits=-d=ssa/intrinsics/debug=1
stderr 'intrinsic substitution for Len64.*BitLen64'
-- go.mod --
module test/main
go 1.19
go 1.20
-- main.go --
package main

2
testdata/script/debugdir.txtar vendored
Unescape Escape View File

@ -18,7 +18,7 @@ stderr 'test/main' # we force rebuilds with -debugdir
-- go.mod --
module test/main
go 1.19
go 1.20
-- main.go --
package main

2
testdata/script/embed.txtar vendored
Unescape Escape View File

@ -11,7 +11,7 @@ cmp stdout main.stdout
-- go.mod --
module test/main
go 1.19
go 1.20
-- main.go --
package main

2
testdata/script/goenv.txtar vendored
Unescape Escape View File

@ -46,7 +46,7 @@ exec $NAME/garble$exe build
-- go.mod --
module test/main
go 1.19
go 1.20
-- main.go --
package main

2
testdata/script/gogarble.txtar vendored
Unescape Escape View File

@ -51,7 +51,7 @@ bincmp out_rebuild out
-- go.mod --
module test/main
go 1.19
go 1.20
-- standalone/main.go --
package main

24
testdata/script/goversion.txtar vendored
Unescape Escape View File

@ -23,7 +23,7 @@ stderr 'Go version "devel go1\.15-.*2020.*" is too old; please upgrade to Go 1\.
# A current devel version should be fine.
# Note that we don't look at devel version timestamps.
env GARBLE_TEST_GOVERSION='go1.20'
env TOOLCHAIN_GOVERSION='devel go1.20-ad97d204f0 Sun Sep 12 16:46:58 2021 +0000'
env TOOLCHAIN_GOVERSION='devel go1.20-ad97d204f0 Sun Sep 12 16:46:58 2023 +0000'
! garble build
stderr 'mocking the real build'
@ -45,40 +45,40 @@ env TOOLCHAIN_GOVERSION='devel go1.20-somecustomversion'
stderr 'mocking the real build'
# The current toolchain may be older than the one that built garble.
env GARBLE_TEST_GOVERSION='go1.20'
env TOOLCHAIN_GOVERSION='go1.19.3'
env GARBLE_TEST_GOVERSION='go1.21'
env TOOLCHAIN_GOVERSION='go1.20.3'
! garble build
stderr 'mocking the real build'
# The current toolchain may be equal to the one that built garble.
env GARBLE_TEST_GOVERSION='devel go1.19-6673d5d701 Sun Mar 20 16:05:03 2022 +0000'
env TOOLCHAIN_GOVERSION='devel go1.19-6673d5d701 Sun Mar 20 16:05:03 2022 +0000'
env GARBLE_TEST_GOVERSION='devel go1.20-6673d5d701 Sun Mar 20 16:05:03 2023 +0000'
env TOOLCHAIN_GOVERSION='devel go1.20-6673d5d701 Sun Mar 20 16:05:03 2023 +0000'
! garble build
stderr 'mocking the real build'
# The current toolchain must not be newer than the one that built garble.
env GARBLE_TEST_GOVERSION='go1.18'
env TOOLCHAIN_GOVERSION='go1.19.1'
env TOOLCHAIN_GOVERSION='go1.20.1'
! garble build
stderr 'garble was built with "go1\.18" and is being used with "go1\.19\.1"; please rebuild garble with the newer version'
stderr 'garble was built with "go1\.18" and is being used with "go1\.20\.1"; please rebuild garble with the newer version'
# We'll error even if the difference is a minor (bugfix) level.
# In practice it probably wouldn't matter, but in theory it could still lead to tricky bugs.
env GARBLE_TEST_GOVERSION='go1.19.11'
env TOOLCHAIN_GOVERSION='go1.19.14'
env GARBLE_TEST_GOVERSION='go1.20.11'
env TOOLCHAIN_GOVERSION='go1.20.14'
! garble build
stderr 'garble was built with "go1\.19\.11" and is being used with "go1\.19\.14"; please rebuild garble with the newer version'
stderr 'garble was built with "go1\.20\.11" and is being used with "go1\.20\.14"; please rebuild garble with the newer version'
# If garble builds itself and is then used, it won't know what version built it.
# As a fallback, we drop the comparison against the toolchain's version.
env GARBLE_TEST_GOVERSION='bogus version'
env TOOLCHAIN_GOVERSION='go1.19.3'
env TOOLCHAIN_GOVERSION='go1.20.3'
! garble build
stderr 'mocking the real build'
-- go.mod --
module test/main
go 1.19
go 1.20
-- main.go --
package main

2
testdata/script/help.txtar vendored
Unescape Escape View File

@ -117,6 +117,6 @@ stderr 'usage: garble version'
-- go.mod --
module dummy
go 1.19
go 1.20
-- dummy.go --
package dummy

2
testdata/script/implement.txtar vendored
Unescape Escape View File

@ -13,7 +13,7 @@ cmp stdout main.stdout
-- go.mod --
module test/main
go 1.19
go 1.20
-- main.go --
package main

2
testdata/script/imports.txtar vendored
Unescape Escape View File

@ -42,7 +42,7 @@ cmp stdout main.stdout
-- go.mod --
module test/main
go 1.19
go 1.20
require (
gopkg.in/garbletest.v2 v2.999.0

2
testdata/script/init.txtar vendored
Unescape Escape View File

@ -12,7 +12,7 @@ cmp stderr main.stderr
-- go.mod --
module test/main
go 1.19
go 1.20
-- main.go --
package main

2
testdata/script/ldflags.txtar vendored
Unescape Escape View File

@ -28,7 +28,7 @@ binsubstr main$exe 'unexportedVersion' 'ExportedUnset' 'v1.22.33' 'garble_replac
-- go.mod --
module domain.test/main
go 1.19
go 1.20
-- main.go --
package main

3
testdata/script/linker.txtar vendored
Unescape Escape View File

@ -15,8 +15,7 @@ cmp stderr main.stderr
-- go.mod --
module test/main
go 1.19
go 1.20
-- main.go --
package main

4
testdata/script/linkname.txtar vendored
Unescape Escape View File

@ -14,7 +14,7 @@ cmp stderr main.stderr
-- go.mod --
module test/main
go 1.19
go 1.20
replace big.chungus/meme => ./big.chungus/meme
@ -149,7 +149,7 @@ func ByteIndex(s string, c byte) int
-- big.chungus/meme/go.mod --
module test/main
go 1.19
go 1.20
-- big.chungus/meme/dante.go --
package meme

2
testdata/script/literals.txtar vendored
Unescape Escape View File

@ -54,7 +54,7 @@ garble -literals build std
-- go.mod --
module test/main
go 1.19
go 1.20
-- main.go --
package main

2
testdata/script/modinfo.txtar vendored
Unescape Escape View File

@ -26,7 +26,7 @@ stdout 'build\s*vcs.revision='${HEAD_COMMIT_SHA}
-- go.mod --
module test/main
go 1.19
go 1.20
-- main.go --
package main

2
testdata/script/plugin.txtar vendored
Unescape Escape View File

@ -26,7 +26,7 @@ cmp stderr main.stderr
-- go.mod --
module test/main
go 1.19
go 1.20
-- plugin/main.go --
package main

2
testdata/script/position.txtar vendored
Unescape Escape View File

@ -16,7 +16,7 @@ stdout 'varPositions is sorted'
-- go.mod --
module test/main
go 1.19
go 1.20
-- garble_main.go --
package main

2
testdata/script/reflect.txtar vendored
Unescape Escape View File

@ -14,7 +14,7 @@ cmp stdout main.stdout
-- go.mod --
module test/main
go 1.19
go 1.20
-- garble_main.go --
package main

2
testdata/script/reverse.txtar vendored
Unescape Escape View File

@ -54,7 +54,7 @@ cmp stdout main-literals.stderr
-- go.mod --
module test/main
go 1.19
go 1.20
-- long_main.go --
package main

4
testdata/script/seed-cache.txtar vendored
Unescape Escape View File

@ -32,7 +32,7 @@ cd ..
-- mod1/go.mod --
module test/main/mod1
go 1.19
go 1.20
require gopkg.in/garbletest.v2 v2.999.0
@ -52,7 +52,7 @@ func main() { garbletest.Test() }
-- mod2/go.mod --
module test/main/mod2
go 1.19
go 1.20
require gopkg.in/garbletest.v2 v2.999.0

2
testdata/script/seed.txtar vendored
Unescape Escape View File

@ -96,7 +96,7 @@ cmp stderr importedpkg.stderr
-- go.mod --
module test/main
go 1.19
go 1.20
-- main.go --
package main

4
testdata/script/syntax.txtar vendored
Unescape Escape View File

@ -16,7 +16,7 @@ binsubstr main$exe 'globalVar' # 'globalType' matches on some, but not all, plat
-- extra/go.mod --
module private.source/extra
go 1.19
go 1.20
-- extra/extra.go --
package extra
@ -26,7 +26,7 @@ func Func() string {
-- go.mod --
module test/main
go 1.19
go 1.20
// We include an extra module to obfuscate, included in the same original source
// code via a replace directive.

2
testdata/script/test.txtar vendored
Unescape Escape View File

@ -52,7 +52,7 @@ stdout 'package bar_test, func name: test/bar\.OriginalFuncName'
-- go.mod --
module test/bar
go 1.19
go 1.20
-- bar.go --
package bar

2
testdata/script/tiny.txtar vendored
Unescape Escape View File

@ -27,7 +27,7 @@ stderr 'funcStructExported false funcStructUnexported false'
-- go.mod --
module test/main
go 1.19
go 1.20
-- garble_main.go --
package main

2
testdata/script/typeparams.txtar vendored
Unescape Escape View File

@ -3,7 +3,7 @@ garble build
-- go.mod --
module test/main
go 1.19
go 1.20
-- garble_main.go --
package main

Write Preview
Loading…
Cancel
Save