From 14ef1c05ce7c04361d5ba278147fcb684ae65ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Fri, 17 May 2024 14:52:22 +0200 Subject: [PATCH 1/2] scripts: stricter tag matching in version.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order not to conflict with axosyslog-charts. Signed-off-by: László Várady --- scripts/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/version.sh b/scripts/version.sh index e4a6bed2a8..0779e0cd2e 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -29,7 +29,7 @@ cd $BASEDIR/../ if [ "$VERSION" != "" ]; then echo $VERSION | tr -d '\n' -elif [ -d .git ] && GIT_VERSION=$(git describe --tags --dirty --abbrev=7); then +elif [ -d .git ] && GIT_VERSION=$(git describe --match 'axosyslog-[0-9]*' --tags --dirty --abbrev=7); then echo $GIT_VERSION | sed 's/^axosyslog-//' | tr '-' '.' | tr -d '\n' else cat VERSION.txt | tr -d '\n' From 64c5b585afe26bc2366df993c71326b22b6bb120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Fri, 17 May 2024 14:58:05 +0200 Subject: [PATCH 2/2] ci: use job name "tarball" consistently MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes the nightly as it depended on "needs.tarball.outputs" values. Signed-off-by: László Várady --- .github/workflows/nightly-release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml index 923154b639..cae21755c4 100644 --- a/.github/workflows/nightly-release.yml +++ b/.github/workflows/nightly-release.yml @@ -7,7 +7,7 @@ on: jobs: - create-source-tarball: + tarball: runs-on: ubuntu-latest outputs: snapshot-version: ${{ steps.snapshot-version.outputs.SNAPSHOT_VERSION }} @@ -39,7 +39,7 @@ jobs: path: dbld/build/*.tar.* # create-packages: - # needs: create-source-tarball + # needs: tarball # uses: ./.github/workflows/create-packages.yml # with: # source-tarball-artifact-name: source-tarball @@ -90,7 +90,7 @@ jobs: build-and-test: runs-on: ubuntu-latest needs: - - create-source-tarball + - tarball - axosyslog-modules steps: - name: Checkout source @@ -129,7 +129,7 @@ jobs: publish-image: if: github.ref == 'refs/heads/main' uses: ./.github/workflows/axosyslog-docker.yml - needs: [create-source-tarball, build-and-test, axosyslog-modules] + needs: [tarball, build-and-test, axosyslog-modules] with: pkg-type: nightly tarball-artifact: source-tarball