diff --git a/.github/workflows/digma-docker-image.yml b/.github/workflows/digma-docker-image.yml index 43daeff696..31f6794d9b 100644 --- a/.github/workflows/digma-docker-image.yml +++ b/.github/workflows/digma-docker-image.yml @@ -40,14 +40,10 @@ jobs: with: images: digmaai/jaeger-ui tags: | - type=schedule type=ref,event=branch type=ref,event=pr type=match,pattern=v(.*),group=1 type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} - type=sha # set latest tag for main branch type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} diff --git a/.github/workflows/digma-release.yml b/.github/workflows/digma-release.yml index 2b83677db7..d3091684ed 100644 --- a/.github/workflows/digma-release.yml +++ b/.github/workflows/digma-release.yml @@ -3,7 +3,7 @@ name: Lint & test & build & publish Docker image on: workflow_dispatch: release: - types: [released] + types: [prereleased, released] permissions: contents: write @@ -38,6 +38,7 @@ jobs: name: Update dependencies in Digma UI needs: [build, attach-release-asset, build-push-docker-image] runs-on: ubuntu-latest + if: github.event.release.prerelease == false steps: - uses: actions/checkout@v4 - name: Get Jaeger version diff --git a/packages/jaeger-ui/index.html b/packages/jaeger-ui/index.html index 70f93e7a6a..74b7b5342e 100644 --- a/packages/jaeger-ui/index.html +++ b/packages/jaeger-ui/index.html @@ -39,17 +39,6 @@ // Workaround some legacy NPM dependencies that assume this is always defined. window.global = {}; -