From 76107f2cb96d0f7067b79bb80ac954a6af5d7140 Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Mon, 19 Jun 2023 10:11:45 +0300 Subject: [PATCH 1/3] fix plugin name #2289 --- .github/workflows/build-and-run-tests.yml | 13 ++++++++----- .github/workflows/publish-plugin-from-branch.yml | 8 +++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-and-run-tests.yml b/.github/workflows/build-and-run-tests.yml index 28636e1600..b28ebf3f68 100644 --- a/.github/workflows/build-and-run-tests.yml +++ b/.github/workflows/build-and-run-tests.yml @@ -14,16 +14,19 @@ env: REGISTRY: ghcr.io jobs: - build-and-run-tests: - uses: ./.github/workflows/build-and-run-tests-from-branch.yml - secrets: inherit + # !!! temporary commented !!! +# build-and-run-tests: +# uses: ./.github/workflows/build-and-run-tests-from-branch.yml +# secrets: inherit publish_plugin: - needs: build-and-run-tests + # !!! temporary commented !!! +# needs: build-and-run-tests uses: ./.github/workflows/publish-plugin-from-branch.yml with: # upload artifacts on push action to main only - upload-artifact: ${{ github.event_name == 'push' }} + # !!! temporary commented !!! + upload-artifact: true # ${{ github.event_name == 'push' }} secrets: inherit publish_cli: diff --git a/.github/workflows/publish-plugin-from-branch.yml b/.github/workflows/publish-plugin-from-branch.yml index a6459307cf..2b432556ea 100644 --- a/.github/workflows/publish-plugin-from-branch.yml +++ b/.github/workflows/publish-plugin-from-branch.yml @@ -39,7 +39,7 @@ on: default: "" jobs: - publish_plugin_and_cli: + publish_plugin: strategy: fail-fast: false # force to execute all jobs even though some of them have failed matrix: @@ -65,11 +65,13 @@ jobs: if: ${{ github.event.inputs.custom_version != '' }} run: | echo "VERSION=${{ github.event.inputs.custom_version }}" >> $GITHUB_ENV + echo "VERSION_ARCHIVE=${{ github.event.inputs.custom_version }}" >> $GITHUB_ENV - name: Setup version if: ${{ github.event.inputs.custom_version == '' }} shell: bash run: | - echo "VERSION=${GITHUB_REF_NAME:0:4}-$(date +%Y).$(date +%-m).${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV + echo "VERSION=$(date +%Y).$(date +%-m).${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV + echo "VERSION_ARCHIVE=${GITHUB_REF_NAME:0:4}-$(date +%Y).$(date +%-m).${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV - name: Print environment variables run: printenv @@ -85,5 +87,5 @@ jobs: if: ${{ inputs.upload-artifact == 'true' }} uses: actions/upload-artifact@v3 with: - name: utbot-intellij-${{ matrix.configuration.plugin_type }}-${{ env.VERSION }} + name: utbot-intellij-${{ matrix.configuration.plugin_type }}-${{ env.VERSION_ARCHIVE }} path: utbot-intellij/build/distributions/* From 41419c7ca51af1f636cf0bd5527c1bcab50d193a Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Mon, 19 Jun 2023 10:17:36 +0300 Subject: [PATCH 2/3] comment some lines for tests purposes --- .github/workflows/build-and-run-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-run-tests.yml b/.github/workflows/build-and-run-tests.yml index b28ebf3f68..cef6c1ad83 100644 --- a/.github/workflows/build-and-run-tests.yml +++ b/.github/workflows/build-and-run-tests.yml @@ -30,7 +30,8 @@ jobs: secrets: inherit publish_cli: - needs: build-and-run-tests + # !!! temporary commented !!! +# needs: build-and-run-tests uses: ./.github/workflows/publish-cli-from-branch.yml with: # upload artifacts on push action to main only @@ -38,7 +39,8 @@ jobs: secrets: inherit publish-cli-image: - needs: build-and-run-tests + # !!! temporary commented !!! +# needs: build-and-run-tests if: ${{ github.event_name == 'push' }} strategy: fail-fast: false # force to execute all jobs even though some of them have failed From f1ba48118ccc696636c39c9f1ce0b34326806fae Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Tue, 20 Jun 2023 09:15:12 +0300 Subject: [PATCH 3/3] remove temporary changes --- .github/workflows/build-and-run-tests.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-and-run-tests.yml b/.github/workflows/build-and-run-tests.yml index cef6c1ad83..28636e1600 100644 --- a/.github/workflows/build-and-run-tests.yml +++ b/.github/workflows/build-and-run-tests.yml @@ -14,24 +14,20 @@ env: REGISTRY: ghcr.io jobs: - # !!! temporary commented !!! -# build-and-run-tests: -# uses: ./.github/workflows/build-and-run-tests-from-branch.yml -# secrets: inherit + build-and-run-tests: + uses: ./.github/workflows/build-and-run-tests-from-branch.yml + secrets: inherit publish_plugin: - # !!! temporary commented !!! -# needs: build-and-run-tests + needs: build-and-run-tests uses: ./.github/workflows/publish-plugin-from-branch.yml with: # upload artifacts on push action to main only - # !!! temporary commented !!! - upload-artifact: true # ${{ github.event_name == 'push' }} + upload-artifact: ${{ github.event_name == 'push' }} secrets: inherit publish_cli: - # !!! temporary commented !!! -# needs: build-and-run-tests + needs: build-and-run-tests uses: ./.github/workflows/publish-cli-from-branch.yml with: # upload artifacts on push action to main only @@ -39,8 +35,7 @@ jobs: secrets: inherit publish-cli-image: - # !!! temporary commented !!! -# needs: build-and-run-tests + needs: build-and-run-tests if: ${{ github.event_name == 'push' }} strategy: fail-fast: false # force to execute all jobs even though some of them have failed