From 33e2e89e63cacf09b925a92e4e758916b8719752 Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Fri, 10 May 2024 11:30:41 +0500 Subject: [PATCH 01/18] VCST-1109: Add publish image --- .github/workflows/pr-ci.yml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index c5e48c5053..b9697c5e16 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -33,12 +33,29 @@ jobs: runs-on: ubuntu-latest env: GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }} + ARTIFACT_NAME: 'platform' + envPAT: ${{ secrets.REPO_TOKEN }} + dockerUser: ${{ secrets.DOCKER_USERNAME }} + dockerToken: ${{ secrets.DOCKER_TOKEN }} steps: + # - name: Get cache key + # uses: VirtoCommerce/vc-github-actions/cache-get-key@master + # id: cache-key + # with: + # runnerOs: ${{ runner.os }} + # artifactName: ${{ env.ARTIFACT_NAME }} + - name: Publish image + uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.800.7 + id: publish-image + with: + fullKey: ${{ needs.build.outputs.dockerFullKey }} + shortKey: '${{ needs.build.outputs.dockerShortKey }}-' + dockerTar: ${{ needs.build.outputs.dockerTar }} - name: publish-tag if: ${{ github.event_name == 'pull_request' }} uses: VirtoCommerce/vc-github-actions/publish-artifact-link@master with: - artifactUrl: ${{ needs.build.outputs.imageTag}} + artifactUrl: ${{ steps.publish-image.tag}} repoOrg: ${{ github.repository_owner }} downloadComment: 'Image tag:' - githubToken: ${{ env.GITHUB_TOKEN }} \ No newline at end of file + githubToken: ${{ env.GITHUB_TOKEN }} \ No newline at end of file From 7190082cf0a5bf9f30c5e29f3e087444df0af807 Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Fri, 10 May 2024 11:40:39 +0500 Subject: [PATCH 02/18] VCST-1109: Move publish to job --- .github/workflows/pr-ci.yml | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index b9697c5e16..aefff3de03 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -28,15 +28,25 @@ jobs: secrets: envPAT: ${{ secrets.REPO_TOKEN }} + publish: + needs: + build + uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.800.7 + with: + fullKey: ${{ needs.build.outputs.dockerFullKey }} + shortKey: '${{ needs.build.outputs.dockerShortKey }}-' + dockerTar: ${{ needs.build.outputs.dockerTar }} + secrets: + envPAT: ${{ secrets.REPO_TOKEN }} + dockerUser: ${{ secrets.DOCKER_USERNAME }} + dockerToken: ${{ secrets.DOCKER_TOKEN }} + publish-tag: - needs: build + needs: publish runs-on: ubuntu-latest env: GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }} ARTIFACT_NAME: 'platform' - envPAT: ${{ secrets.REPO_TOKEN }} - dockerUser: ${{ secrets.DOCKER_USERNAME }} - dockerToken: ${{ secrets.DOCKER_TOKEN }} steps: # - name: Get cache key # uses: VirtoCommerce/vc-github-actions/cache-get-key@master @@ -44,18 +54,12 @@ jobs: # with: # runnerOs: ${{ runner.os }} # artifactName: ${{ env.ARTIFACT_NAME }} - - name: Publish image - uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.800.7 - id: publish-image - with: - fullKey: ${{ needs.build.outputs.dockerFullKey }} - shortKey: '${{ needs.build.outputs.dockerShortKey }}-' - dockerTar: ${{ needs.build.outputs.dockerTar }} + - name: publish-tag if: ${{ github.event_name == 'pull_request' }} uses: VirtoCommerce/vc-github-actions/publish-artifact-link@master with: - artifactUrl: ${{ steps.publish-image.tag}} + artifactUrl: ${{ needs.publish.outputs.tag}} repoOrg: ${{ github.repository_owner }} downloadComment: 'Image tag:' githubToken: ${{ env.GITHUB_TOKEN }} \ No newline at end of file From e69e2bcbb4b64183b0844d8adac8a6fafa8fb226 Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Fri, 10 May 2024 11:43:01 +0500 Subject: [PATCH 03/18] VCST-1109: Trigger build --- .github/workflows/pr-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index aefff3de03..0a8e62d541 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -7,7 +7,7 @@ on: pull_request: branches: [ master, dev ] paths-ignore: - - '.github/**' + #- '.github/**' - 'docs/**' - 'build/**' - 'README.md' From 1724b2322348f47508427d540efbb0da89dcd5b6 Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Fri, 10 May 2024 12:09:14 +0500 Subject: [PATCH 04/18] VCST-1109: Test secrets --- .github/workflows/pr-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 0a8e62d541..70ad503b6f 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -38,8 +38,10 @@ jobs: dockerTar: ${{ needs.build.outputs.dockerTar }} secrets: envPAT: ${{ secrets.REPO_TOKEN }} - dockerUser: ${{ secrets.DOCKER_USERNAME }} - dockerToken: ${{ secrets.DOCKER_TOKEN }} + dockerUser: $GITHUB_ACTOR + dockerToken: ${{ secrets.REPO_TOKEN }} + # dockerUser: ${{ secrets.DOCKER_USERNAME }} + # dockerToken: ${{ secrets.DOCKER_TOKEN }} publish-tag: needs: publish From d5630317fdccb5be98db528cfdbfb4dd1acfcb85 Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Tue, 14 May 2024 13:34:22 +0500 Subject: [PATCH 05/18] VCST-1109: Change dockerUser --- .github/workflows/pr-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 70ad503b6f..254b349853 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -38,7 +38,7 @@ jobs: dockerTar: ${{ needs.build.outputs.dockerTar }} secrets: envPAT: ${{ secrets.REPO_TOKEN }} - dockerUser: $GITHUB_ACTOR + dockerUser: ${{ secrets.DOCKER_USERNAME }} # $GITHUB_ACTOR dockerToken: ${{ secrets.REPO_TOKEN }} # dockerUser: ${{ secrets.DOCKER_USERNAME }} # dockerToken: ${{ secrets.DOCKER_TOKEN }} From 5d934d0ceebd75cd1158c9a29f0adeaf6c95cc6e Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Thu, 16 May 2024 11:38:06 +0500 Subject: [PATCH 06/18] VCST-1109: Check secrets --- .github/workflows/pr-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 254b349853..0d7f321ea9 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -38,10 +38,10 @@ jobs: dockerTar: ${{ needs.build.outputs.dockerTar }} secrets: envPAT: ${{ secrets.REPO_TOKEN }} - dockerUser: ${{ secrets.DOCKER_USERNAME }} # $GITHUB_ACTOR - dockerToken: ${{ secrets.REPO_TOKEN }} - # dockerUser: ${{ secrets.DOCKER_USERNAME }} - # dockerToken: ${{ secrets.DOCKER_TOKEN }} + # dockerUser: $GITHUB_ACTOR + # dockerToken: ${{ secrets.REPO_TOKEN }} + dockerUser: ${{ secrets.DOCKER_USERNAME }} + dockerToken: ${{ secrets.DOCKER_TOKEN }} publish-tag: needs: publish From a004a85115d570992d2f57d1b9a21008605caeb7 Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Thu, 16 May 2024 11:46:22 +0500 Subject: [PATCH 07/18] VCST-1109: Set publishToDocker --- .github/workflows/pr-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 0d7f321ea9..8af711f4a7 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -36,6 +36,7 @@ jobs: fullKey: ${{ needs.build.outputs.dockerFullKey }} shortKey: '${{ needs.build.outputs.dockerShortKey }}-' dockerTar: ${{ needs.build.outputs.dockerTar }} + publishToDocker: true secrets: envPAT: ${{ secrets.REPO_TOKEN }} # dockerUser: $GITHUB_ACTOR From a190646ee00468c40d0db4e31ac93a0511c15a12 Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Mon, 3 Jun 2024 09:48:14 +0500 Subject: [PATCH 08/18] VCST-1109: Replace workflow refence with steps --- .github/workflows/pr-ci.yml | 69 ++++++++++++++++++++++++++++++------- 1 file changed, 57 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 8af711f4a7..f994a2f9ad 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -29,20 +29,65 @@ jobs: envPAT: ${{ secrets.REPO_TOKEN }} publish: + runs-on: ubuntu-latest needs: build - uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.800.7 - with: - fullKey: ${{ needs.build.outputs.dockerFullKey }} - shortKey: '${{ needs.build.outputs.dockerShortKey }}-' - dockerTar: ${{ needs.build.outputs.dockerTar }} - publishToDocker: true - secrets: - envPAT: ${{ secrets.REPO_TOKEN }} - # dockerUser: $GITHUB_ACTOR - # dockerToken: ${{ secrets.REPO_TOKEN }} - dockerUser: ${{ secrets.DOCKER_USERNAME }} - dockerToken: ${{ secrets.DOCKER_TOKEN }} + env: + DOCKER_TAR: ${{ needs.build.outputs.dockerTar }} + GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }} + PACKAGE_SERVER: 'ghcr.io' + PUBLISH_TO_DOCKER: true + UPDATE_LATEST_TAG: false + steps: + - name: Get Docker image from cache + uses: actions/cache@v4 + id: restore-build + with: + key: ${{ needs.build.outputs.dockerFullKey }} + restore-keys: '${{ needs.build.outputs.dockerShortKey }}-' + path: | + ${{ env.DOCKER_TAR }} + + - name: Check cache status # Warn workflow if fullKey not present + if: steps.restore-build.outputs.cache-hit != 'true' + run: | + echo -e "\033[33mWarning: Cache not found for input keys: ${{ needs.build.outputs.dockerFullKey }}. The cache may have been restored from alternative key '${{ needs.build.outputs.dockerShortKey }}-'" + + - name: Load Docker image + id: load-docker + uses: VirtoCommerce/vc-github-actions/docker-load-image@master + with: + dockerTar: ${{ env.DOCKER_TAR }} + + - name: Docker Login + uses: docker/login-action@v3 + with: + registry: ${{ env.PACKAGE_SERVER }} + username: $GITHUB_ACTOR + password: ${{ env.GITHUB_TOKEN }} + + - name: Publish Docker Image + uses: VirtoCommerce/vc-github-actions/publish-docker-image@master + with: + image: ${{ steps.load-docker.outputs.image }} + tag: ${{ steps.load-docker.outputs.tag }} + docker_user: ${{ secrets.DOCKER_USERNAME }} + docker_token: ${{ secrets.DOCKER_TOKEN }} + docker_hub: ${{ env.PUBLISH_TO_DOCKER }} + update_latest: ${{ env.UPDATE_LATEST_TAG }} + + # uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.800.7 + # with: + # fullKey: ${{ needs.build.outputs.dockerFullKey }} + # shortKey: '${{ needs.build.outputs.dockerShortKey }}-' + # dockerTar: ${{ needs.build.outputs.dockerTar }} + # publishToDocker: true + # secrets: + # envPAT: ${{ secrets.REPO_TOKEN }} + # # dockerUser: $GITHUB_ACTOR + # # dockerToken: ${{ secrets.REPO_TOKEN }} + # dockerUser: ${{ secrets.DOCKER_USERNAME }} + # dockerToken: ${{ secrets.DOCKER_TOKEN }} publish-tag: needs: publish From 836134ba02da708cc63c3afab14a5dc1faef60c2 Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Mon, 3 Jun 2024 10:02:28 +0500 Subject: [PATCH 09/18] VCST-1109: Disable publish to docker --- .github/workflows/pr-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index f994a2f9ad..ed4c2109af 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -36,7 +36,7 @@ jobs: DOCKER_TAR: ${{ needs.build.outputs.dockerTar }} GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }} PACKAGE_SERVER: 'ghcr.io' - PUBLISH_TO_DOCKER: true + PUBLISH_TO_DOCKER: false UPDATE_LATEST_TAG: false steps: - name: Get Docker image from cache From 13f1553facfb4bf95f9e51a1f980449dcfe5e6b6 Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Mon, 3 Jun 2024 10:31:49 +0500 Subject: [PATCH 10/18] VCST-1109: Test script for push --- .github/workflows/pr-ci.yml | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index ed4c2109af..255aeeb3ce 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -59,22 +59,27 @@ jobs: with: dockerTar: ${{ env.DOCKER_TAR }} - - name: Docker Login - uses: docker/login-action@v3 - with: - registry: ${{ env.PACKAGE_SERVER }} - username: $GITHUB_ACTOR - password: ${{ env.GITHUB_TOKEN }} + # - name: Docker Login + # uses: docker/login-action@v3 + # with: + # registry: ${{ env.PACKAGE_SERVER }} + # username: $GITHUB_ACTOR + # password: ${{ env.GITHUB_TOKEN }} - - name: Publish Docker Image - uses: VirtoCommerce/vc-github-actions/publish-docker-image@master - with: - image: ${{ steps.load-docker.outputs.image }} - tag: ${{ steps.load-docker.outputs.tag }} - docker_user: ${{ secrets.DOCKER_USERNAME }} - docker_token: ${{ secrets.DOCKER_TOKEN }} - docker_hub: ${{ env.PUBLISH_TO_DOCKER }} - update_latest: ${{ env.UPDATE_LATEST_TAG }} + - name: Push to GH + run: | + docker login --username $GITHUB_ACTOR --password ${{ env.GITHUB_TOKEN }} + docker push ${{ steps.load-docker.outputs.image }}:${{ steps.load-docker.outputs.tag }} + + # - name: Publish Docker Image + # uses: VirtoCommerce/vc-github-actions/publish-docker-image@master + # with: + # image: ${{ steps.load-docker.outputs.image }} + # tag: ${{ steps.load-docker.outputs.tag }} + # docker_user: ${{ secrets.DOCKER_USERNAME }} + # docker_token: ${{ secrets.DOCKER_TOKEN }} + # docker_hub: ${{ env.PUBLISH_TO_DOCKER }} + # update_latest: ${{ env.UPDATE_LATEST_TAG }} # uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.800.7 # with: From 97ae1a2cf6c7350610dc631b0a97fe67d9b31969 Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Mon, 3 Jun 2024 10:46:38 +0500 Subject: [PATCH 11/18] VCST-1109: Add package server --- .github/workflows/pr-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 255aeeb3ce..5d33c4738a 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -68,7 +68,7 @@ jobs: - name: Push to GH run: | - docker login --username $GITHUB_ACTOR --password ${{ env.GITHUB_TOKEN }} + docker login --username $GITHUB_ACTOR --password ${{ env.GITHUB_TOKEN }} ghcr.io docker push ${{ steps.load-docker.outputs.image }}:${{ steps.load-docker.outputs.tag }} # - name: Publish Docker Image @@ -81,6 +81,7 @@ jobs: # docker_hub: ${{ env.PUBLISH_TO_DOCKER }} # update_latest: ${{ env.UPDATE_LATEST_TAG }} + # uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.800.7 # with: # fullKey: ${{ needs.build.outputs.dockerFullKey }} From 01ec85b774d77ab9b69d9c9bd80c63fe5079c436 Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Mon, 3 Jun 2024 10:51:59 +0500 Subject: [PATCH 12/18] VCST-1109: Change secrets --- .github/workflows/pr-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 5d33c4738a..9938bcb885 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -68,7 +68,7 @@ jobs: - name: Push to GH run: | - docker login --username $GITHUB_ACTOR --password ${{ env.GITHUB_TOKEN }} ghcr.io + docker login --username ${{ secrets.DOCKER_USERNAME }} --password ${{ secrets.DOCKER_TOKEN }} ghcr.io docker push ${{ steps.load-docker.outputs.image }}:${{ steps.load-docker.outputs.tag }} # - name: Publish Docker Image From e7ff95dd5ea4c2b109bdaf0a902ce1963a3b5c3a Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Fri, 28 Jun 2024 16:14:15 +0500 Subject: [PATCH 13/18] VCST-1109: Check publish-docker-image --- .github/workflows/pr-ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 9938bcb885..cf1e26bc78 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -66,20 +66,20 @@ jobs: # username: $GITHUB_ACTOR # password: ${{ env.GITHUB_TOKEN }} - - name: Push to GH - run: | - docker login --username ${{ secrets.DOCKER_USERNAME }} --password ${{ secrets.DOCKER_TOKEN }} ghcr.io - docker push ${{ steps.load-docker.outputs.image }}:${{ steps.load-docker.outputs.tag }} + # - name: Push to GH + # run: | + # docker login --username $GITHUB_ACTOR --password ${{ env.GITHUB_TOKEN }} ${{ env.PACKAGE_SERVER }} + # docker push ${{ steps.load-docker.outputs.image }}:${{ steps.load-docker.outputs.tag }} - # - name: Publish Docker Image - # uses: VirtoCommerce/vc-github-actions/publish-docker-image@master - # with: - # image: ${{ steps.load-docker.outputs.image }} - # tag: ${{ steps.load-docker.outputs.tag }} - # docker_user: ${{ secrets.DOCKER_USERNAME }} - # docker_token: ${{ secrets.DOCKER_TOKEN }} - # docker_hub: ${{ env.PUBLISH_TO_DOCKER }} - # update_latest: ${{ env.UPDATE_LATEST_TAG }} + - name: Publish Docker Image + uses: VirtoCommerce/vc-github-actions/publish-docker-image@master + with: + image: ${{ steps.load-docker.outputs.image }} + tag: ${{ steps.load-docker.outputs.tag }} + docker_user: ${{ secrets.DOCKER_USERNAME }} + docker_token: ${{ secrets.DOCKER_TOKEN }} + docker_hub: ${{ env.PUBLISH_TO_DOCKER }} + update_latest: ${{ env.UPDATE_LATEST_TAG }} # uses: VirtoCommerce/.github/.github/workflows/publish-docker.yml@v3.800.7 From fdb3e0b7306464b39c52e9ac4d31f0c994a8788d Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Fri, 28 Jun 2024 16:20:58 +0500 Subject: [PATCH 14/18] VCST-1109: Fix variables --- .github/workflows/pr-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index cf1e26bc78..0bab5f652e 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -76,8 +76,8 @@ jobs: with: image: ${{ steps.load-docker.outputs.image }} tag: ${{ steps.load-docker.outputs.tag }} - docker_user: ${{ secrets.DOCKER_USERNAME }} - docker_token: ${{ secrets.DOCKER_TOKEN }} + docker_user: $GITHUB_ACTOR # ${{ secrets.DOCKER_USERNAME }} + docker_token: ${{ env.GITHUB_TOKEN }} # ${{ secrets.DOCKER_TOKEN }} docker_hub: ${{ env.PUBLISH_TO_DOCKER }} update_latest: ${{ env.UPDATE_LATEST_TAG }} From ba41b49f059235aa72cac7e011fef46fdf35eeab Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Fri, 28 Jun 2024 16:33:50 +0500 Subject: [PATCH 15/18] VCST-1109: Check creds --- .github/workflows/pr-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 0bab5f652e..716cbe1d8b 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -76,7 +76,7 @@ jobs: with: image: ${{ steps.load-docker.outputs.image }} tag: ${{ steps.load-docker.outputs.tag }} - docker_user: $GITHUB_ACTOR # ${{ secrets.DOCKER_USERNAME }} + docker_user: ${{ secrets.DOCKER_USERNAME }} docker_token: ${{ env.GITHUB_TOKEN }} # ${{ secrets.DOCKER_TOKEN }} docker_hub: ${{ env.PUBLISH_TO_DOCKER }} update_latest: ${{ env.UPDATE_LATEST_TAG }} From d382936e2cad33c7bc776424ad2194e985c90cfe Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Tue, 6 Aug 2024 11:12:32 +0500 Subject: [PATCH 16/18] VCST-1109: Enable Platform-ci trigger for PR --- .github/workflows/platform-ci.yml | 9 +++++++++ .github/workflows/pr-ci.yml | 20 ++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/platform-ci.yml b/.github/workflows/platform-ci.yml index c9623b9bb5..c1b70b2fbb 100644 --- a/.github/workflows/platform-ci.yml +++ b/.github/workflows/platform-ci.yml @@ -21,6 +21,15 @@ on: - '**/argoDeploy.json' - '**/cloudDeploy.json' branches: [ master, dev ] + pull_request: + paths-ignore: + #- '.github/**' # enable before merge + - 'docs/**' + - 'build/**' + - 'README.md' + - 'LICENSE' + - '**/argoDeploy.json' + - '**/cloudDeploy.json' jobs: ci: diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml index 716cbe1d8b..59d45df5e0 100644 --- a/.github/workflows/pr-ci.yml +++ b/.github/workflows/pr-ci.yml @@ -4,16 +4,16 @@ name: Platform PR build on: workflow_dispatch: - pull_request: - branches: [ master, dev ] - paths-ignore: - #- '.github/**' - - 'docs/**' - - 'build/**' - - 'README.md' - - 'LICENSE' - - '**/argoDeploy.json' - - '**/cloudDeploy.json' + # pull_request: + # branches: [ master, dev ] + # paths-ignore: + # #- '.github/**' + # - 'docs/**' + # - 'build/**' + # - 'README.md' + # - 'LICENSE' + # - '**/argoDeploy.json' + # - '**/cloudDeploy.json' jobs: test: From 48a79f184d5038a21b81d0de7889b57f8925956f Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Tue, 6 Aug 2024 11:22:24 +0500 Subject: [PATCH 17/18] VCST-1109: Change reference title in PR --- .github/workflows/platform-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/platform-ci.yml b/.github/workflows/platform-ci.yml index c1b70b2fbb..f28f4765c3 100644 --- a/.github/workflows/platform-ci.yml +++ b/.github/workflows/platform-ci.yml @@ -219,7 +219,7 @@ jobs: with: artifactUrl: ${{ steps.artifactUrl.outputs.DOCKER_URL }} repoOrg: ${{ github.repository_owner }} - downloadComment: 'Artifact URL:' + downloadComment: 'Image tag:' - name: Publish Github Release if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' }} From 5fb4dfd9cfe156cde3358bed35f35a81cb3d068c Mon Sep 17 00:00:00 2001 From: Andrew Kubyshkin Date: Tue, 6 Aug 2024 11:59:43 +0500 Subject: [PATCH 18/18] VCST-1109: Trigger workflow --- .github/workflows/platform-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/platform-ci.yml b/.github/workflows/platform-ci.yml index f28f4765c3..170ebb66c9 100644 --- a/.github/workflows/platform-ci.yml +++ b/.github/workflows/platform-ci.yml @@ -320,4 +320,4 @@ jobs: jiraKeys: ${{ needs.ci.outputs.jira-keys }} argoServer: 'argo.virtocommerce.cloud' matrix: '{"include":${{ needs.ci.outputs.matrix }}}' - secrets: inherit + secrets: inherit \ No newline at end of file