Merge branch 'develop'

update changelog
2024-08-05 23:40:00 +02:00 · 2024-08-05 23:39:58 +02:00 · 2024-08-05 23:39:22 +02:00 · 2024-08-05 23:39:21 +02:00 · 2024-08-05 23:33:10 +02:00 · 2024-08-05 23:33:08 +02:00
4 changed files with 15 additions and 7 deletions
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@ -19,10 +19,10 @@ steps:
    commands:
      - make CUSTOM_EXTRA_NAME=-deb12
-  # "Run build (debian 11)":
+  "Run build (debian 11)":
-  #   image: deblan/golang-gtk:1.22-bullseye
+    image: deblan/golang-gtk:1.22-bullseye
-  #   commands:
+    commands:
-  #     - make CUSTOM_EXTRA_NAME=-deb11
+      - make CUSTOM_EXTRA_NAME=-deb11 TAGS=glib_2_66
  "Publish":
    image: plugins/gitea-release
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,10 @@
 [Unreleased]
 ## v2.0.0-2 - 2024-08-05
 ### Added
 - add build for Debian 11
 - update screenshot
 ## v2.0.0 - 2024-08-05
 ### Changed
 - full refactoring: usage of GTK 3
--- a/9
+++ b/9
@ -1,8 +1,9 @@
 CGO_ENABLED  = 1
 DIR          = ./build
 TAGS         =
-GO_ARCH_AMD	 = amd64
+GO_ARCH_AMD	       = amd64
-GO_OS_LINUX	 = linux
+GO_OS_LINUX	       = linux
 CUSTOM_EXTRA_NAME ?=
 EXECUTABLE   = wireguard-gui
@ -24,7 +25,9 @@ $(BIN_LINUX_AMD64):
 	CGO_ENABLED=$(CGO_ENABLED) \
 	GOARCH=$(GO_ARCH_AMD) \
 	GOOS=$(GO_OS_LINUX) \
-	$(CC) -ldflags="$(LDFLAGS)" \
+	$(CC) \
 	-ldflags="$(LDFLAGS)" \
 	-tags="$(TAGS)" \
 	-o $(BIN_LINUX_AMD64) .
 .PHONY: clean
--- a/img/screenshot.png
+++ b/img/screenshot.png
Author	SHA1	Message	Date
Simon Vieille	9bbbe855c0	Merge branch 'develop' All checks were successful ci/woodpecker/tag/build Pipeline was successful Details ci/woodpecker/push/build Pipeline was successful Details	2024-08-05 23:40:00 +02:00
Simon Vieille	2a28f1d769	update changelog Some checks are pending ci/woodpecker/push/build Pipeline is pending approval Details	2024-08-05 23:39:58 +02:00
Simon Vieille	fff9f38a48	Merge branch 'develop' Some checks are pending ci/woodpecker/push/build Pipeline is pending approval Details	2024-08-05 23:39:22 +02:00
Simon Vieille	9189db1cc5	fix makefile Some checks are pending ci/woodpecker/push/build Pipeline is pending approval Details	2024-08-05 23:39:21 +02:00
Simon Vieille	0a4d828831	Merge branch 'develop' Some checks failed ci/woodpecker/push/build Pipeline is pending approval Details ci/woodpecker/tag/build Pipeline failed Details	2024-08-05 23:33:10 +02:00
Simon Vieille	d49a877434	update changelog Some checks are pending ci/woodpecker/push/build Pipeline is pending approval Details	2024-08-05 23:33:08 +02:00
Simon Vieille	7eac3892f6	Merge branch 'develop' Some checks are pending ci/woodpecker/push/build Pipeline is pending approval Details	2024-08-05 23:32:25 +02:00
Simon Vieille	58c81ce813	update screenshot Some checks are pending ci/woodpecker/push/build Pipeline is pending approval Details	2024-08-05 23:32:17 +02:00
Simon Vieille	1ad3ac5b5d	add build rule for debian 11	2024-08-05 23:32:07 +02:00