@@ -14,27 +14,26 @@ jobs:
1414 sync :
1515 runs-on : ubuntu-latest
1616 steps :
17- - run : |
17+ - env :
18+ GH_TOKEN : ${{ secrets.GH_SYSTEMSDT_TOKEN }}
19+ GIT_CONFIG_NAME : ${{ vars.GH_SYSTEMSDT_USERNAME }}
20+ GIT_CONFIG_EMAIL : ${{ secrets.GH_SYSTEMSDT_EMAIL }}
21+ run : |
1822 export GIT_USERNAME="${GIT_CONFIG_NAME}"
1923 export GIT_PASSWORD="${GH_TOKEN}"
2024 export ENTERPRISE_REPO="https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/devtron-labs/devtron-enterprise.git"
2125 git clone https://github.com/devtron-labs/devtron
2226 git clone $ENTERPRISE_REPO
23-
2427 cd devtron && export GIT_COMMIT_ID=`git log --format="%H" -n 1`
25-
2628 export GIT_COMMIT=${GIT_COMMIT_ID:0:8}
2729 echo $GIT_COMMIT
2830 git config --global user.email $GIT_CONFIG_EMAIL
2931 git config --global user.name $GIT_USERNAME
30-
3132 git status && git checkout main && git pull
32-
3333 cd ../devtron-enterprise && git status && git checkout main && git pull
3434 git remote add oss-devtron ../devtron && git remote -v && git remote update && git merge oss-devtron/main
3535 export WIRE_GEN_FILE_NAME="wire_gen.go"
3636 export CONFLICT_FILES=`git diff --name-only --diff-filter=U --relative`
37-
3837 if [[ $WIRE_GEN_FILE_NAME = $CONFLICT_FILES ]]
3938 then
4039 rm $WIRE_GEN_FILE_NAME
4948 git checkout -b oss-enterprise-sync-$GIT_COMMIT && git push -u origin oss-enterprise-sync-$GIT_COMMIT
5049 PR_RESPONSE=$(gh pr create --title "SYNC: OSS sync for $GIT_COMMIT" --fill --base main --head oss-enterprise-sync-$GIT_COMMIT --repo $ENTERPRISE_REPO)
5150 echo "FINAL PR RESPONSE: $PR_RESPONSE"
52- env:
53- GH_TOKEN: ${{ secrets.GIT_TARGET_TOKEN }}
54- GIT_CONFIG_NAME: ${{ secrets.GIT_TARGET_USERNAME }}
55- GIT_CONFIG_EMAIL: ${{ secrets.GIT_TARGET_EMAIL }}
0 commit comments