From 08b5395d86f68595ebb8a9173f09b8b9ad5d1d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C5=A1a=20Tomi=C4=87?= Date: Thu, 4 Apr 2024 11:23:55 +0000 Subject: [PATCH 1/3] fix: k8s repo make MR --- .github/workflows/main.yaml | 4 ++-- .github/workflows/update-k8s-deployments/action.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index b88ef3c99..e5ff33b7c 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -68,7 +68,7 @@ jobs: run: bazel query --noshow_progress 'kind("oci_push", ...)' | xargs -I_target bazel run _target -- --tag ${GITHUB_SHA} ######################################## - # Check if dashboard/* changed to see if + # Check if dashboard/* changed to see if # it also needs to be updated in k8s ######################################## - name: "❓ Check if dashboard/* changed in last commit" @@ -100,7 +100,7 @@ jobs: # Update k8s deployments ######################################## - name: "🤖 Update k8s deployments" - if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.head_ref, 'container') || startsWith(github.ref, 'refs/heads/container') || (github.ref == 'refs/heads/main') }} + # if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.head_ref, 'container') || startsWith(github.ref, 'refs/heads/container') || (github.ref == 'refs/heads/main') }} uses: ./.github/workflows/update-k8s-deployments with: gitlab_api_token: ${{ secrets.GITLAB_K8S_API_TOKEN }} diff --git a/.github/workflows/update-k8s-deployments/action.yaml b/.github/workflows/update-k8s-deployments/action.yaml index 1ab7ddc41..14ddba293 100644 --- a/.github/workflows/update-k8s-deployments/action.yaml +++ b/.github/workflows/update-k8s-deployments/action.yaml @@ -29,7 +29,7 @@ runs: git config user.name "IDX Automation" DRE_REPO_BRANCH="${{ github.head_ref || github.event.pull_request.head.ref }}" K8S_REPO_BRANCH="update-dre-images" - git checkout -b "${NEW_BRANCH}" + git checkout -b "${K8S_REPO_BRANCH}" # Update the internal dashboard image refs # this regex matches the first group (ie the image name) and uses \1 @@ -50,5 +50,5 @@ runs: -o merge_request.create \ -o merge_request.title="[nomrbot] - Updating DRE container images" \ -o merge_request.description="Updating the DRE container images based on the latest changes in the DRE repository - [here](https://github.com/dfinity/dre/commits/$DRE_REPO_BRANCH" \ - --force --set-upstream origin "${NEW_BRANCH}" || \ - git push --force --set-upstream origin "${NEW_BRANCH}" + --force --set-upstream origin "${K8S_REPO_BRANCH}" || \ + git push --force --set-upstream origin "${K8S_REPO_BRANCH}" From 853816fd92b41b10ac3badd4e1d980d8bda091fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C5=A1a=20Tomi=C4=87?= Date: Thu, 4 Apr 2024 11:29:44 +0000 Subject: [PATCH 2/3] test disable --- .github/workflows/main.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index e5ff33b7c..6b5d988a2 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -25,15 +25,15 @@ jobs: - name: "☁️ Setup runner" uses: ./.github/workflows/manage-runner-pre - ######################################## - # Build and test - ######################################## - - name: "🚀 Building" - uses: ./.github/workflows/build - with: - ssh_pk_workflow: ${{ secrets.SSH_PK_WORKFLOW }} - - run: bazel test ... - name: "🚀 Testing" + # ######################################## + # # Build and test + # ######################################## + # - name: "🚀 Building" + # uses: ./.github/workflows/build + # with: + # ssh_pk_workflow: ${{ secrets.SSH_PK_WORKFLOW }} + # - run: bazel test ... + # name: "🚀 Testing" ######################################## # Upload test artifacts From c5e33d7c8837522b2b61939e54c257951b983712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C5=A1a=20Tomi=C4=87?= Date: Thu, 4 Apr 2024 12:03:34 +0000 Subject: [PATCH 3/3] revert test changes --- .github/workflows/main.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 6b5d988a2..eb65cba5f 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -25,15 +25,15 @@ jobs: - name: "☁️ Setup runner" uses: ./.github/workflows/manage-runner-pre - # ######################################## - # # Build and test - # ######################################## - # - name: "🚀 Building" - # uses: ./.github/workflows/build - # with: - # ssh_pk_workflow: ${{ secrets.SSH_PK_WORKFLOW }} - # - run: bazel test ... - # name: "🚀 Testing" + ######################################## + # Build and test + ######################################## + - name: "🚀 Building" + uses: ./.github/workflows/build + with: + ssh_pk_workflow: ${{ secrets.SSH_PK_WORKFLOW }} + - run: bazel test ... + name: "🚀 Testing" ######################################## # Upload test artifacts @@ -100,7 +100,7 @@ jobs: # Update k8s deployments ######################################## - name: "🤖 Update k8s deployments" - # if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.head_ref, 'container') || startsWith(github.ref, 'refs/heads/container') || (github.ref == 'refs/heads/main') }} + if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.head_ref, 'container') || startsWith(github.ref, 'refs/heads/container') || (github.ref == 'refs/heads/main') }} uses: ./.github/workflows/update-k8s-deployments with: gitlab_api_token: ${{ secrets.GITLAB_K8S_API_TOKEN }}