Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scripts: stricter tag matching in version.sh #95

Merged
merged 2 commits into from
May 17, 2024
Merged

scripts: stricter tag matching in version.sh #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14ef1c0
scripts: stricter tag matching in version.sh
MrAnno May 17, 2024
64c5b58
ci: use job name "tarball" consistently
MrAnno May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/nightly-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:


jobs:
create-source-tarball:
tarball:
runs-on: ubuntu-latest
outputs:
snapshot-version: ${{ steps.snapshot-version.outputs.SNAPSHOT_VERSION }}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
build-and-test:
runs-on: ubuntu-latest
needs:
- create-source-tarball
- tarball
- axosyslog-modules
steps:
- name: Checkout source
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading