diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1d7e490e0..bb998bff3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -48,4 +48,4 @@ jobs: shell: pwsh run: ./scripts/build_docker.ps1 -github_actor '${{ github.actor }}' - -release_tag '${{ inputs.release_tag }}${{ github.event.inputs.release_tag }}' + -release_tag '${{ inputs.release_tag }}' diff --git a/scripts/version.ps1 b/scripts/version.ps1 index 08e74758f..08bf28789 100644 --- a/scripts/version.ps1 +++ b/scripts/version.ps1 @@ -8,7 +8,7 @@ param( [string] $release_tag ) - + . $PSScriptRoot/exec.ps1 $now = Get-Date @@ -17,16 +17,25 @@ $minor = $now.ToString("MM") $patch = $now.ToString("dd") $describe = exec { git describe --long --always } $parts = $describe.split('-') -$height = [int]$parts[-2] +$height = 0 $unique_hash = $parts[-1].Trim('g') $full_hash = exec { git rev-parse --verify HEAD } $version = "$major.$minor.$patch" - # add build number if this is not the first tag with this version $pre_release = "" -if ((git tag -l $version) -and ($height -gt 0)) { - $pre_release = "-build$height" +Write-Output "Checking if tag exists $describe" +if (git tag -l $version) { + # because we use the date for the version, we can have multiple versions + # with the same name + # to fix this we add a "build" number to the version if a build tag of the + # same version already exists + # we keep incrementing the build number until we find the next build number + # that has not been used + while (git tag -l "$version-build$height") { + $height++ + } + $pre_release = "-build$height" } # build must be metadata only, can't alter version meaning @@ -45,4 +54,4 @@ return [PSCustomObject]@{ DescribeVersion = "${version}${pre_release}+${build}" # Calender version including pre-release and build DockerTag = "${version}${pre_release}_${build}" -} \ No newline at end of file +} diff --git a/src/app/components/shared/audio-event-card/annotation-event-card.component.html b/src/app/components/shared/audio-event-card/annotation-event-card.component.html index e1975ab38..6d39b9093 100644 --- a/src/app/components/shared/audio-event-card/annotation-event-card.component.html +++ b/src/app/components/shared/audio-event-card/annotation-event-card.component.html @@ -5,7 +5,7 @@ [id]="spectrogramId" [src]="annotation.audioLink" scaling="stretch" - color-map="audacity" + color-map="grayscale" class="spectrogram" >