diff --git a/.travis.yml b/.travis.yml index 616f90c1..922c9f50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: go sudo: required go: - - 1.14 + - 1.15.2 go_import_path: github.com/root-gg/plik diff --git a/Makefile b/Makefile index ed93a128..b252be5e 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL = /bin/bash RELEASE_VERSION = $(shell version/version.sh) RELEASE_DIR = "release/plik-$(RELEASE_VERSION)" -RELEASE_TARGETS = darwin-386 darwin-amd64 freebsd-386 \ +RELEASE_TARGETS = darwin-amd64 freebsd-386 \ freebsd-amd64 linux-386 linux-amd64 linux-arm openbsd-386 \ openbsd-amd64 windows-amd64 windows-386 diff --git a/README.md b/README.md index 5621e32e..26635546 100644 --- a/README.md +++ b/README.md @@ -27,16 +27,16 @@ Plik is a scalable & friendly temporary file upload system ( wetransfer like ) i - [Filelink for Plik](https://gitlab.com/joendres/filelink-plik) : Thunderbird Addon to upload attachments to Plik ### Version -1.3-RC1 +1.3 ### Installation ##### From release To run plik, it's very simple : ```sh -$ wget https://github.com/root-gg/plik/releases/download/1.3-RC1/plik-1.3-RC1-linux-64bits.tar.gz -$ tar xzvf plik-1.3-RC1-linux-64bits.tar.gz -$ cd plik-1.3-RC1/server +$ wget https://github.com/root-gg/plik/releases/download/1.3/plik-1.3-linux-64bits.tar.gz +$ tar xzvf plik-1.3-linux-64bits.tar.gz +$ cd plik-1.3/server $ ./plikd ``` Et voilĂ  ! You now have a fully functional instance of Plik running on http://127.0.0.1:8080. diff --git a/changelog/1.3 b/changelog/1.3 new file mode 100644 index 00000000..bc7d2bb5 --- /dev/null +++ b/changelog/1.3 @@ -0,0 +1,26 @@ +Plik 1.3 + + Hi, today we're releasing Plik 1.3 ! + + Here is the changelog : + + New + - Add --info to cli client to display server configuration + + Fixed + - Fix common.AskConfirmation handling of no input + - Fix missing unit in frontend menu when default TTL equals 86400s + - Fix missing downloadDomain in bash script if not given in plikd.cfg + + Removed + - darwin-386 target ( https://github.com/golang/go/issues/37610 ) + + Misc + - Improved cross-compilation in Makefile + - Cross-compiled docker images + - Pass build info using ldflags + + Binaries are compiled using Go v1.15.2 + +Faithfully, +The Plik team \ No newline at end of file diff --git a/client/test_downgrade.sh b/client/test_downgrade.sh index 6131a24f..c04a04c7 100755 --- a/client/test_downgrade.sh +++ b/client/test_downgrade.sh @@ -24,6 +24,7 @@ RELEASES=( 1.2.2 1.2.3 1.2.4 + 1.3-RC1 ) ### diff --git a/client/test_upgrade.sh b/client/test_upgrade.sh index 40f7081b..f4e11bf5 100755 --- a/client/test_upgrade.sh +++ b/client/test_upgrade.sh @@ -25,6 +25,7 @@ RELEASES=( 1.2.2 1.2.3 1.2.4 + 1.3-RC1 ) ### diff --git a/version/version.go b/version/version.go index d4b1c6d3..df12a849 100644 --- a/version/version.go +++ b/version/version.go @@ -1,6 +1,6 @@ package version -const version = "1.3-RC1" +const version = "1.3" // Get return the current package version func Get() string { diff --git a/version/version_test.go b/version/version_test.go index e57d589e..bdb683c1 100644 --- a/version/version_test.go +++ b/version/version_test.go @@ -8,7 +8,7 @@ import ( ) func getVersionRegex() string { - return `^\d+\.\d+((\.\d+)|(\-RC\d+))$` + return `^\d+\.\d+((\.\d+)?|(\-RC\d+))$` } func validateVersion(t *testing.T, version string, ok bool) { @@ -23,6 +23,7 @@ func validateVersion(t *testing.T, version string, ok bool) { } func TestValidateVersionRegex(t *testing.T) { + validateVersion(t, "1.1", true) validateVersion(t, "1.1.1", true) validateVersion(t, "1.1-RC1", true) validateVersion(t, "1.1.1-RC1", false)