From 1eb3de4f166f1b5b1ddca32b35448290c5527272 Mon Sep 17 00:00:00 2001 From: William Petit Date: Fri, 25 Aug 2023 10:20:42 -0600 Subject: [PATCH] feat: add changelog to released files --- Jenkinsfile | 20 ++++++++------------ Makefile | 3 ++- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 551868c..f156b9a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -63,18 +63,14 @@ pipeline { make gitea-release ''' } - def currentVersion = sh(returnStdout: true, script: 'make full-version').trim() - if (currentVersion.endsWith('-dirty')) { - unstable('Could not trigger emissary-firmware build, dirty version !') - } else { - build( - job: "../emissary-firmware/${env.GIT_BRANCH}", - parameters: [ - [$class: 'StringParameterValue', name: 'emissaryRelease', value: currentVersion] - ], - wait: false - ) - } + + build( + job: "../emissary-firmware/${env.GIT_BRANCH}", + parameters: [ + [$class: 'StringParameterValue', name: 'emissaryRelease', value: currentVersion] + ], + wait: false + ) } } } diff --git a/Makefile b/Makefile index 398ae43..578285f 100644 --- a/Makefile +++ b/Makefile @@ -97,13 +97,14 @@ deploy-openwrt-agent: scp dist/emissary-agent_linux_arm_6/emissary root@$(OPENWRT_DEVICE):/usr/bin/emissary ssh root@$(OPENWRT_DEVICE) /etc/init.d/emissary-agent start -gitea-release: .mktools tools/gitea-release/bin/gitea-release.sh goreleaser +gitea-release: .mktools tools/gitea-release/bin/gitea-release.sh goreleaser changelog mkdir -p .gitea-release rm -rf .gitea-release/* cp dist/*.tar.gz .gitea-release/ cp dist/*.apk .gitea-release/ cp dist/*.deb .gitea-release/ + cp CHANGELOG.md .gitea-release/ GITEA_RELEASE_PROJECT="emissary" \ GITEA_RELEASE_ORG="arcad" \