Skip to content

Commit

Permalink
Drop Debian Stretch and bump go to 1.20
Browse files Browse the repository at this point in the history
  • Loading branch information
the-ress committed Jun 11, 2023
1 parent 004a2c1 commit 4cd9721
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
debian_packages: [BULLSEYE, BUSTER, STRETCH]
debian_packages: [BULLSEYE, BUSTER]
arch: [armhf, amd64]

steps:
Expand Down
8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/
```

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 4cd9721

Please sign in to comment.