From 4d3dbc44b06db3fe42d3ff046ed00a47be5820ab Mon Sep 17 00:00:00 2001 From: Tereza Tomcova Date: Mon, 12 Jun 2023 01:35:54 +0200 Subject: [PATCH] Drop Debian Stretch and bump go to 1.20 --- .github/workflows/build.yml | 2 +- Makefile | 8 ++------ README.md | 8 ++++---- go.mod | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d5a3dae1..8ce1b21c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - debian_packages: [BULLSEYE, BUSTER, STRETCH] + debian_packages: [BULLSEYE, BUSTER] arch: [armhf, amd64] steps: diff --git a/Makefile b/Makefile index ca28a89c..a3ed2b82 100755 --- a/Makefile +++ b/Makefile @@ -21,20 +21,16 @@ ARCH = armhf # ARCH = amd64 BULLSEYE_NAME := bullseye -BULLSEYE_IMAGE := golang:1.19-bullseye +BULLSEYE_IMAGE := golang:1.20-bullseye BULLSEYE_GO_TAGS := "gtk_3_24 glib_deprecated glib_2_66" # Buster's gtk 3.24.5 doesn't work with gtk_3_24 tag # Using gtk_3_22 produces some deprecation warnings, but it compiles # More info: https://github.com/gotk3/gotk3/issues/874 BUSTER_NAME := buster -BUSTER_IMAGE := golang:1.19-buster +BUSTER_IMAGE := golang:1.20-buster BUSTER_GO_TAGS := "gtk_3_22 glib_deprecated glib_2_58 pango_1_42" -STRETCH_NAME := stretch -STRETCH_IMAGE := golang:1.19rc1-stretch -STRETCH_GO_TAGS := "gtk_3_22 glib_deprecated glib_2_50 cairo_1_14 pango_1_40" - # Build information #GIT_COMMIT = $(shell git rev-parse HEAD | cut -c1-7) VERSION := 2.8.0 diff --git a/README.md b/README.md index cc6a6efe..6b2fd979 100755 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ You will also need to set up the video drivers for the display you are using. I ### Install From a .deb Package -There are two ways to install OctoScreen: the recommended and supported way is to install from a .deb package, or you can choose to install from building the sources yourself. The recommended way to install OctoScreen is use the `.deb` packages from the [Releases](https://github.com/Z-Bolt/OctoScreen/releases) page. The packages are available for Debian Stretch based distributions such as Raspbian and OctoPi. +There are two ways to install OctoScreen: the recommended and supported way is to install from a .deb package, or you can choose to install from building the sources yourself. The recommended way to install OctoScreen is use the `.deb` packages from the [Releases](https://github.com/Z-Bolt/OctoScreen/releases) page. The packages are available for Debian based distributions such as Raspbian and OctoPi. For example, to install on a new RaspberryPi with OctoPi: ```sh @@ -115,10 +115,10 @@ make build ls -1 build/ ``` -The default build is for the STRETCH release of debian, but BUSTER and JESSIE are also possible. To build one of these targets, you just have to specify the package during make. -Example for BUSTER: +The default build is for the BUSTER release of debian, but BULLSEYE is also possible. To build one of these targets, you just have to specify the package during make. +Example for BULLSEYE: ```sh -make build DEBIAN_PACKAGES=BUSTER +make build DEBIAN_PACKAGES=BULLSEYE ls -1 build/ ``` diff --git a/go.mod b/go.mod index c9195e9f..dc23ceae 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/Z-Bolt/OctoScreen -go 1.19 +go 1.20 require ( github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf