Skip to content

Commit 4cd9721

Browse files
committed
Drop Debian Stretch and bump go to 1.20
1 parent 004a2c1 commit 4cd9721

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
debian_packages: [BULLSEYE, BUSTER, STRETCH]
15+
debian_packages: [BULLSEYE, BUSTER]
1616
arch: [armhf, amd64]
1717

1818
steps:

Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,16 @@ ARCH = armhf
2121
# ARCH = amd64
2222

2323
BULLSEYE_NAME := bullseye
24-
BULLSEYE_IMAGE := golang:1.19-bullseye
24+
BULLSEYE_IMAGE := golang:1.20-bullseye
2525
BULLSEYE_GO_TAGS := "gtk_3_24 glib_deprecated glib_2_66"
2626

2727
# Buster's gtk 3.24.5 doesn't work with gtk_3_24 tag
2828
# Using gtk_3_22 produces some deprecation warnings, but it compiles
2929
# More info: https://github.com/gotk3/gotk3/issues/874
3030
BUSTER_NAME := buster
31-
BUSTER_IMAGE := golang:1.19-buster
31+
BUSTER_IMAGE := golang:1.20-buster
3232
BUSTER_GO_TAGS := "gtk_3_22 glib_deprecated glib_2_58 pango_1_42"
3333

34-
STRETCH_NAME := stretch
35-
STRETCH_IMAGE := golang:1.19rc1-stretch
36-
STRETCH_GO_TAGS := "gtk_3_22 glib_deprecated glib_2_50 cairo_1_14 pango_1_40"
37-
3834
# Build information
3935
#GIT_COMMIT = $(shell git rev-parse HEAD | cut -c1-7)
4036
VERSION := 2.8.0

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ You will also need to set up the video drivers for the display you are using. I
7979

8080
### Install From a .deb Package
8181

82-
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.
82+
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.
8383

8484
For example, to install on a new RaspberryPi with OctoPi:
8585
```sh
@@ -115,10 +115,10 @@ make build
115115
ls -1 build/
116116
```
117117

118-
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.
119-
Example for BUSTER:
118+
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.
119+
Example for BULLSEYE:
120120
```sh
121-
make build DEBIAN_PACKAGES=BUSTER
121+
make build DEBIAN_PACKAGES=BULLSEYE
122122
ls -1 build/
123123
```
124124

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/Z-Bolt/OctoScreen
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf

0 commit comments

Comments
 (0)