feat: use emissary v2023.4.6-d2f865c

Jenkinsfile

@@ -29,27 +29,38 @@ pipeline {
             }
             steps {
                 script {
-                    steps {
-                        currentEmissaryRelease = readFile('emissary_release.txt')
+                    currentEmissaryRelease = readFile('emissary_release.txt').trim()
 
-                        if (currentEmissaryRelease == params.emissaryRelease) {
-                            currentBuild.result = 'SUCCESS'
-                            return
-                        }
+                    if (currentEmissaryRelease == params.emissaryRelease) {
+                        currentBuild.result = 'SUCCESS'
+                        return
+                    }
 
+                    withCredentials([
+                        usernamePassword([
+                        credentialsId: 'forge-jenkins',
+                        usernameVariable: 'GIT_USERNAME',
+                        passwordVariable: 'GIT_PASSWORD'
+                        ])
+                    ]) {
                         sh """
+                        git config user.email "jenkins@cadoles.com"
+                        git config user.name "Jenkins"
+                        git config credential.https://forge.cadoles.com.username "\$GIT_USERNAME"
+                        git config credential.https://forge.cadoles.com.helper '!f() { test "\$1" = get && echo "password=\$GIT_PASSWORD"; }; f'
+
                         echo '${params.emissaryRelease}' > emissary_release.txt
                         git add emissary_release.txt
                         git commit -m "feat: use emissary ${params.emissaryRelease}"
                         git pull --rebase
-                        git push
+                        git push origin \$(git rev-parse HEAD):${env.GIT_BRANCH}
                         """
                     }
                 }
             }
         }
 
-        stage('Build') {
+        stage('Build and release') {
             steps {
                 script {
                     withCredentials([

Makefile

@@ -22,7 +22,7 @@ IMAGEBUILDER_CUSTOM_FILES_DIR_PATH := $(IMAGEBUILDER_DIR_PATH)/files
 
 BIN_DIR := "$(shell readlink -f bin)/$(OPENWRT_VERSION)/$(OPENWRT_TARGET)/$(OPENWRT_PROFILE)$(BIN_DIR_NAME_SUFFIX)"
 
-GITEA_DOWNLOAD_RELEASE_NAME ?= $(shell cat emissary_release.txt)
+EMISSARY_RELEASE ?= $(shell cat emissary_release.txt)
 EMISSARY_ARCH ?= armv6
 
 EMISSARY_RECONCILIATION_INTERVAL ?=
@@ -109,8 +109,8 @@ gitea-release: tools/gitea-release/bin/gitea-release.sh
 		GITEA_RELEASE_NAME="$(FULL_VERSION)" \
 		GITEA_RELEASE_COMMITISH_TARGET="$(GIT_VERSION)" \
 		GITEA_RELEASE_IS_DRAFT="false" \
-		GITEA_RELEASE_BODY="" \
-		GITEA_RELEASE_ATTACHMENTS="$(shell find .gitea-release/* -type f)" \
+		GITEA_RELEASE_BODY="With Emissary $(EMISSARY_RELEASE)" \
+		GITEA_RELEASE_ATTACHMENTS="$$(find .gitea-release/* -type f)" \
 		tools/gitea-release/bin/gitea-release.sh
 
 .PHONY: download-emissary-release
@@ -119,7 +119,7 @@ download-emissary-release: tools/gitea-download/bin/gitea-download.sh
 	GITEA_DOWNLOAD_PROJECT="emissary" \
 		GITEA_DOWNLOAD_ORG="arcad" \
 		GITEA_DOWNLOAD_BASE_URL="https://forge.cadoles.com" \
-		GITEA_DOWNLOAD_RELEASE_NAME="$(GITEA_DOWNLOAD_RELEASE_NAME)" \
+		GITEA_DOWNLOAD_RELEASE_NAME="$(EMISSARY_RELEASE)" \
 		GITEA_DOWNLOAD_ATTACHMENTS_FILTER="\.tar\.gz$$" \
 		tools/gitea-download/bin/gitea-download.sh
 

emissary_release.txt

@@ -1 +1 @@
-v2023.3.29-e5b6c5e
+v2023.4.6-d2f865c

misc/emissary/keep.d/emissary

@@ -1,4 +1,3 @@
 /etc/machine-id
 /data/emissary/agent-key.json
-/data/emissary/agent-state.json
 /data/emissary/apps/data