From 599e61e6f5dce92f6f93cc8c8446de757f354cda Mon Sep 17 00:00:00 2001
From: Vitaly <v.uvarov@dodopizza.com>
Date: Wed, 1 May 2024 12:34:14 +0000
Subject: [PATCH] upd(workflow)

---
 .github/workflows/ci.yml               |  6 ++--
 .github/workflows/dodo-build-image.yml | 40 --------------------------
 .github/workflows/release.yml          |  8 +++---
 3 files changed, 6 insertions(+), 48 deletions(-)
 delete mode 100644 .github/workflows/dodo-build-image.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0e7fe6a6010..8709e7d28ec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,8 +3,8 @@ name: CI
 on:
   push:
     branches:
-      - main
-      - release-*
+      - dodo
+      # - release-*
   pull_request: {}
 
 env:
@@ -168,8 +168,6 @@ jobs:
       build-arch: ${{ matrix.build-arch }}
       ref: ${{ github.ref }}
     secrets:
-      # GHCR_USERNAME: ${{ secrets.GHCR_USERNAME }}
-      # GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}
       GHCR_USERNAME: ${{ github.actor }}
       GHCR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/dodo-build-image.yml b/.github/workflows/dodo-build-image.yml
deleted file mode 100644
index 4d4961b3d9b..00000000000
--- a/.github/workflows/dodo-build-image.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Build and push image (Dodo)
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - dodo
-
-jobs:
-  push:
-    name: Build and push image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Get short SHA
-        run: echo "sha7=$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_ENV
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          file: "Dockerfile.standalone"
-          tags: >
-            ghcr.io/${{ github.repository }}:latest,
-            ghcr.io/${{ github.repository }}:${{ env.sha7 }}
-          platforms: |
-            linux/amd64
-      - name: Output image tags
-        run: |
-          echo "**Public docker image:** ghcr.io/${{ github.repository }}:${{ env.sha7 }}" >> $GITHUB_STEP_SUMMARY
-          echo "**Commit message:** ${{ github.event.head_commit.message }}" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8785a76bc7c..861fb6e19dd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -89,8 +89,8 @@ jobs:
         uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
         with:
           registry: ghcr.io
-          username: ${{ secrets.GHCR_USERNAME }}
-          password: ${{ secrets.GHCR_TOKEN }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Promote Container Image
         run: make docker.promote
@@ -108,8 +108,8 @@ jobs:
         with:
           image-name: ${{ env.IMAGE_NAME }}
           image-tag: ${{ env.RELEASE_TAG }}
-          GHCR_USERNAME: ${{ secrets.GHCR_USERNAME }}
-          GHCR_TOKEN: ${{ secrets.GHCR_TOKEN }}
+          GHCR_USERNAME: ${{ github.actor }}
+          GHCR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Update Release