Update reposync.yaml mksdns

kamal-devtron · Aug 21, 2023 · 7ad90fb · 7ad90fb
1 parent c6c0eae
commit 7ad90fb
Showing 1 changed file with 4 additions and 19 deletions.
diff --git a/.github/workflows/reposync.yaml b/.github/workflows/reposync.yaml
@@ -15,8 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - run: |
-         # export GIT_USERNAME="${GIT_CONFIG_NAME}"
-         # export GIT_PASSWORD="${GH_TOKEN}"
+        
          export ENTERPRISE_REPO="https://github.com/kamal-devtron/testing.git"
          git clone https://github.com/kamal-devtron/action-testing.git
          git clone $ENTERPRISE_REPO
@@ -41,24 +40,10 @@ jobs:
             echo "Branch exsist"  
 
          git remote add oss-devtron ../devtron && git remote -v && git remote update && git merge oss-devtron/main
-         # export WIRE_GEN_FILE_NAME="wire_gen.go"
-         # export CONFLICT_FILES=`git diff --name-only --diff-filter=U --relative`
-
-         # if [[ $WIRE_GEN_FILE_NAME = $CONFLICT_FILES ]]
-         # then
-         #    rm $WIRE_GEN_FILE_NAME
-         #    docker container run -w /devtron -v ./:/devtron golang  /bin/sh -c "go install github.com/google/wire/cmd/wire@latest && wire"
-         #    git add $WIRE_GEN_FILE_NAME
-         # elif [[ $CONFLICT_FILES != "" ]]
-         # then
-         #    echo "more conflict files"
-         #    exit 1
-         # fi
+         
          git commit -m "OSS main synced" && git status
          git checkout -b oss-enterprise-sync-$GIT_COMMIT && git push -u origin oss-enterprise-sync-$GIT_COMMIT
          PR_RESPONSE=$(gh pr create --title "SYNC: OSS sync for $GIT_COMMIT" --fill --base main --head oss-enterprise-sync-$GIT_COMMIT --repo $ENTERPRISE_REPO)
          echo "FINAL PR RESPONSE: $PR_RESPONSE"
-      env:
-       GH_TOKEN: ${{ secrets.GIT_TARGET_TOKEN }}
-       GIT_CONFIG_NAME: ${{ secrets.GIT_TARGET_USERNAME }}
-       GIT_CONFIG_EMAIL: ${{ secrets.GIT_TARGET_EMAIL }}
+   
+