From f30180c7b0c1912dc50c28f393938fe51eb1abef Mon Sep 17 00:00:00 2001 From: Kyrylo Shmidt Date: Fri, 17 Nov 2023 20:18:11 +0100 Subject: [PATCH 1/3] Bump version --- .github/workflows/release.yml | 27 +++++++++++++++++++++++++-- Dockerfile | 2 +- package.json | 2 +- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7b76829af..583893281 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,11 +40,34 @@ jobs: name: dockerfile path: Dockerfile - download: - name: Build and push Docker image + bump_version: + name: Bump version needs: [build] runs-on: ubuntu-latest + steps: + - name: Get tag + id: tag + uses: dawidd6/action-get-tag@v1 + with: + strip_v: true + + - name: Bump version + run: npm version ${{ steps.tag.outputs.tag }} --no-commit-hooks --no-git-tag-version + + - name: Upload assets to release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{ steps.publishToMarketplace.outputs.vsixPath }} + asset_name: digma.vsix + tag: ${{ github.ref }} + + publish: + name: Build and push Docker image + needs: [bump_version] + runs-on: ubuntu-latest + steps: - uses: actions/download-artifact@v3 with: diff --git a/Dockerfile b/Dockerfile index 79dc8bc33..0a9b3f6a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,4 +4,4 @@ COPY ./dist/ /usr/share/nginx/html/ COPY ./nginx.conf.template /etc/nginx/conf.d/default.conf.template RUN rm /usr/share/nginx/html/index.html -CMD ["/bin/sh" , "-c" , "envsubst '${PLUGIN_API_URL}' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf && exec nginx -g 'daemon off;'"] \ No newline at end of file +CMD ["/bin/sh" , "-c" , "envsubst '${PLUGIN_API_URL} ${PLUGIN_API_TOKEN}' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf && exec nginx -g 'daemon off;'"] \ No newline at end of file diff --git a/package.json b/package.json index 78310eaa5..7ab1d325a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "digma-ui", - "version": "1.0.1", + "version": "1.1.0", "description": "Digma UI", "main": "dist/index.js", "scripts": { From f00c35e5b7ad91b806cc84fdbd6f51081fd648f8 Mon Sep 17 00:00:00 2001 From: Kyrylo Shmidt Date: Fri, 17 Nov 2023 20:20:04 +0100 Subject: [PATCH 2/3] Rollback release workflow --- .github/workflows/release.yml | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 583893281..7b76829af 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,32 +40,9 @@ jobs: name: dockerfile path: Dockerfile - bump_version: - name: Bump version - needs: [build] - runs-on: ubuntu-latest - - steps: - - name: Get tag - id: tag - uses: dawidd6/action-get-tag@v1 - with: - strip_v: true - - - name: Bump version - run: npm version ${{ steps.tag.outputs.tag }} --no-commit-hooks --no-git-tag-version - - - name: Upload assets to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ steps.publishToMarketplace.outputs.vsixPath }} - asset_name: digma.vsix - tag: ${{ github.ref }} - - publish: + download: name: Build and push Docker image - needs: [bump_version] + needs: [build] runs-on: ubuntu-latest steps: From b5be1715c9b4f8792ee0ff5099ff5917671c4320 Mon Sep 17 00:00:00 2001 From: Kyrylo Shmidt Date: Fri, 17 Nov 2023 20:23:15 +0100 Subject: [PATCH 3/3] Update package-lock.json --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 448cc2f07..8889da379 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "digma-ui", - "version": "1.0.1", + "version": "1.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "digma-ui", - "version": "1.0.1", + "version": "1.1.0", "license": "MIT", "dependencies": { "@floating-ui/react": "^0.25.1",