feat(packaging): ignore minor version diff when executing sysupgrade on openwrt

feat: update arcad/edge dependency
2024-01-11 14:31:48 +01:00 · 2024-01-10 14:32:09 +01:00 · 2023-12-05 22:42:21 +01:00 · 2023-12-05 22:39:42 +01:00 · 2023-12-05 21:29:57 +01:00 · 2023-12-05 14:32:43 +01:00
6 changed files with 11 additions and 8 deletions
--- a/go.mod
+++ b/go.mod
@ -5,7 +5,7 @@ go 1.21
 toolchain go1.21.2

 require (
-	forge.cadoles.com/arcad/edge v0.0.0-20231201112253-83a1e8966559
+	forge.cadoles.com/arcad/edge v0.0.0-20240110122251-a268759d330f
 	github.com/Masterminds/sprig/v3 v3.2.3
 	github.com/alecthomas/participle/v2 v2.0.0-beta.5
 	github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
@ -36,7 +36,6 @@ require (
 require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.2.0 // indirect
-	github.com/allegro/bigcache/v3 v3.1.0 // indirect
 	github.com/barnybug/go-cast v0.0.0-20201201064555-a87ccbc26692 // indirect
 	github.com/dop251/goja_nodejs v0.0.0-20230320130059-dcf93ba651dd // indirect
 	github.com/gabriel-vasile/mimetype v1.4.1 // indirect
@ -49,6 +48,7 @@ require (
 	github.com/huandu/xstrings v1.3.3 // indirect
 	github.com/igm/sockjs-go/v3 v3.0.2 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf // indirect
 	github.com/keegancsmith/rpc v1.3.0 // indirect
 	github.com/klauspost/compress v1.16.6 // indirect
 	github.com/miekg/dns v1.1.53 // indirect
@ -124,3 +124,4 @@ require (
 )

 // replace forge.cadoles.com/arcad/edge => ../edge
+replace github.com/allegro/bigcache/v3 v3.1.0 => github.com/Bornholm/bigcache v0.0.0-20231201111725-1ddf51584cad
--- a/go.sum
+++ b/go.sum
@ -54,8 +54,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-forge.cadoles.com/arcad/edge v0.0.0-20231201112253-83a1e8966559 h1:w44upL8eAJdCzS2+Sx0WIRT2QaAq8gotRwwL9j9z3yQ=
-forge.cadoles.com/arcad/edge v0.0.0-20231201112253-83a1e8966559/go.mod h1:tMysrBPkzPFZAi89qD4TioDjcP3L2hadBJ5Eoij8GcA=
+forge.cadoles.com/arcad/edge v0.0.0-20240110122251-a268759d330f h1:vIS4sbAcqLkgs/SkP3Zyqrn4Cgtgw4yiqfB3C2uQjJY=
+forge.cadoles.com/arcad/edge v0.0.0-20240110122251-a268759d330f/go.mod h1:MDQg88kowO/IUqPXznGERdfiaVn4lWk8VRwKDD+LTgw=
 gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg=
 github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=
@ -148,8 +148,6 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
 github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk=
-github.com/allegro/bigcache/v3 v3.1.0 h1:H2Vp8VOvxcrB91o86fUSVJFqeuz8kpyyB02eH3bSzwk=
-github.com/allegro/bigcache/v3 v3.1.0/go.mod h1:aPyh7jEvrog9zAwx5N7+JUQX5dZTSGpxF1LAR4dr35I=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
@ -796,6 +794,8 @@ github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH
 github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf h1:FtEj8sfIcaaBfAKrE1Cwb61YDtYq9JxChK1c7AKce7s=
+github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf/go.mod h1:yrqSXGoD/4EKfF26AOGzscPOgTTJcyAwM2rpixWT+t4=
 github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ=
 github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
 github.com/j-keck/arping v1.0.2/go.mod h1:aJbELhR92bSk7tp79AWM/ftfc90EfEi2bQJrbBFOsPw=
--- a/misc/jenkins/Dockerfile
+++ b/misc/jenkins/Dockerfile
@ -4,7 +4,7 @@ ARG HTTP_PROXY=
 ARG HTTPS_PROXY=
 ARG http_proxy=
 ARG https_proxy=
-ARG GO_VERSION=1.21.1
+ARG GO_VERSION=1.21.5

 # Install dev environment dependencies
 RUN export DEBIAN_FRONTEND=noninteractive &&\
--- a/misc/packaging/common/config-agent.yml
+++ b/misc/packaging/common/config-agent.yml
@ -54,9 +54,9 @@ agent:
      enabled: true
      sysupgradeCommand:
        - sysupgrade
-        - --force
        - -u
        - -v
+        - --ignore-minor-compat-version
        - '%FIRMWARE%'
      firmwareVersionCommand:
        - sh
--- a/misc/packaging/openrc/emissary-agent.logrotate.conf
+++ b/misc/packaging/openrc/emissary-agent.logrotate.conf
@ -3,6 +3,7 @@
 	sharedscripts
 	compress
 	rotate 7
+	daily
 	postrotate
 		/etc/init.d/emissary-agent restart
 	endscript
--- a/misc/packaging/openrc/emissary-server.logrotate.conf
+++ b/misc/packaging/openrc/emissary-server.logrotate.conf
@ -3,6 +3,7 @@
 	sharedscripts
 	compress
 	rotate 7
+	daily
 	postrotate
 		/etc/init.d/emissary-server restart
 	endscript
Author	SHA1	Message	Date
William Petit	a5c81dc4b4	feat(packaging): ignore minor version diff when executing sysupgrade on openwrt All checks were successful arcad/emissary/pipeline/head This commit looks good Details	2024-01-11 14:31:48 +01:00
William Petit	fefac830fd	feat: update arcad/edge dependency All checks were successful arcad/emissary/pipeline/head This commit looks good Details	2024-01-10 14:32:09 +01:00
William Petit	c43d1a5da6	feat: update arcad/edge dependency All checks were successful arcad/emissary/pipeline/head This commit looks good Details	2023-12-05 22:42:21 +01:00
William Petit	3f200e1674	feat: use go 1.21.5 Some checks reported errors arcad/emissary/pipeline/head Something is wrong with the build of this commit Details	2023-12-05 22:39:42 +01:00
William Petit	d9f11ac877	feat: update arcad/edge dependency All checks were successful arcad/emissary/pipeline/head This commit looks good Details	2023-12-05 21:29:57 +01:00
William Petit	16a59fe027	feat: update arcad/edge dependency All checks were successful arcad/emissary/pipeline/head This commit looks good Details	2023-12-05 14:32:43 +01:00
William Petit	8d42bf0b34	feat: update arcad/edge dependency All checks were successful arcad/emissary/pipeline/head This commit looks good Details	2023-12-03 14:28:52 +01:00
William Petit	3c3d7fe82d	feat: update arcad/edge dependency All checks were successful arcad/emissary/pipeline/head This commit looks good Details	2023-12-01 15:21:29 +01:00
William Petit	ddddbbc895	feat: replace github.com/allegro/bigcache/v3 by github.com/Bornholm/bigcache All checks were successful arcad/emissary/pipeline/head This commit looks good Details	2023-12-01 14:26:59 +01:00
William Petit	32ce5a206f	feat(packaging): rotate logs daily on alpine All checks were successful arcad/emissary/pipeline/head This commit looks good Details	2023-12-01 13:53:19 +01:00