From 3ea4f97369d45d09ece2bc4b65cfbb3e4d4407f2 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Mon, 5 Aug 2024 19:39:57 +0200 Subject: [PATCH] update ci --- .woodpecker/build.yml | 23 +++++++++-------------- Makefile | 5 +++-- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index e80b20d..6ed623c 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -8,30 +8,25 @@ when: - release/* - renovate/* -variables: - - &golang_image 'golang:1.22' - steps: "Add vendor": - image: *golang_image + image: golang:1.22 commands: - go mod vendor - "Run build": - image: *golang_image + "Run build (debian 11)": + image: 1.22.5-bullseye commands: - apt-get update - apt-get install -y libgtk-3-dev libcairo2-dev libglib2.0-dev libgdk-pixbuf2.0-0 - - make + - make CUSTOM_EXTRA_NAME=-deb11 - "Create packages": - image: deblan/fpm-packager + "Run build (debian 12)": + image: 1.22.5-bookworm commands: - - VERSION=${CI_COMMIT_TAG/v//} - - ./bin/build-debs.sh "$VERSION" - - ./bin/rename-builds.sh "$VERSION" - when: - event: [tag] + - apt-get update + - apt-get install -y libgtk-3-dev libcairo2-dev libglib2.0-dev libgdk-pixbuf2.0-0 + - make USTOM_EXTRA_NAME=-deb12 "Publish": image: plugins/gitea-release diff --git a/Makefile b/Makefile index 2cf65a7..65c3c0a 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,13 @@ -CGO_ENABLED = 1 +CGO_ENABLED = 1 DIR = ./build GO_ARCH_AMD = amd64 GO_OS_LINUX = linux +CUSTOM_EXTRA_NAME ?= EXECUTABLE = wireguard-gui -BIN_LINUX_AMD64 = $(DIR)/$(EXECUTABLE)-$(GO_OS_LINUX)-$(GO_ARCH_AMD) +BIN_LINUX_AMD64 = $(DIR)/$(EXECUTABLE)-$(GO_OS_LINUX)$(CUSTOM_EXTRA_NAME)-$(GO_ARCH_AMD) CC = go build LDFLAGS = all=-w -s