Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
0ba92c9
Update README.md
pawan-59 Aug 22, 2022
536b43e
Update Dockerfile
pawan-59 Aug 26, 2022
2fea82b
Update script1.js
pawan-59 Sep 3, 2022
6e136d7
Update Dockerfile
pawan-59 Sep 28, 2022
0f3aa2e
updated repo
pawan-59 Sep 28, 2022
1c5e7dd
Update README.md
pawan-59 Oct 8, 2022
5565187
Update README.md
pawan-59 Oct 8, 2022
465c49d
Update script1.js
pawan-59 Oct 18, 2022
4638f52
Update script1.js
pawan-59 Oct 18, 2022
dfc9cfe
Update script.js
pawan-59 Oct 26, 2022
98ccabb
Update script1.js
pawan-59 Nov 17, 2022
9f18955
Update script.js
pawan-59 Dec 12, 2022
d949886
Update script.js
pawan-59 Jan 5, 2023
e6ff153
Update script.js
pawan-59 Jan 5, 2023
6f892c6
Update script.js
pawan-59 Jan 30, 2023
f85a96a
Create repo-sync.yml
pawan-59 Mar 17, 2023
f005779
Update README.md
pawan-59 Mar 17, 2023
3dd542e
Update README.md
pawan-59 Mar 17, 2023
a7bfcb1
Update repo-sync.yml
pawan-59 Mar 17, 2023
62839ad
Update README.md
pawan-59 Mar 17, 2023
154a5a5
Update repo-sync.yml
pawan-59 Mar 17, 2023
e053c12
Update README.md
pawan-59 Mar 17, 2023
4e30ce7
Update repo-sync.yml
pawan-59 Mar 17, 2023
ba3b60a
Update repo-sync.yml
pawan-59 Mar 17, 2023
10a2e1d
Update repo-sync.yml
pawan-59 Mar 17, 2023
2e609d2
Update README.md
pawan-59 Mar 17, 2023
1fe7f94
Update repo-sync.yml
pawan-59 Mar 17, 2023
6d9204d
Update repo-sync.yml
pawan-59 Mar 17, 2023
80cf9b0
Update repo-sync.yml
pawan-59 Mar 17, 2023
ffc8c28
Update repo-sync.yml
pawan-59 Mar 17, 2023
26b9a39
Update repo-sync.yml
pawan-59 Mar 17, 2023
ba90bde
Update repo-sync.yml
pawan-59 Mar 17, 2023
176ca33
Update repo-sync.yml
pawan-59 Mar 17, 2023
dbef9c6
Update repo-sync.yml
pawan-59 Mar 17, 2023
41b5440
Update repo-sync.yml
pawan-59 Mar 17, 2023
9f6aab7
Update repo-sync.yml
pawan-59 Mar 17, 2023
10986f8
Update README.md
pawan-59 Apr 24, 2023
86d016b
Update script.js
pawan-59 Apr 24, 2023
7d07a8f
Update Dockerfile
pawan-59 Jul 31, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions .github/workflows/repo-sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: repo-sync

# Controls when the workflow will run
on:
push:
branches:
- main

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
sync:
runs-on: ubuntu-latest
steps:
- run: |
export GIT_USERNAME="${GIT_CONFIG_NAME}"
export GIT_PASSWORD="${GH_TOKEN}"
export ENTERPRISE_REPO="https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/devtron-labs/devtron-enterprise.git"
git clone https://github.com/devtron-labs/devtron
git clone $ENTERPRISE_REPO

cd devtron && export GIT_COMMIT_ID=`git log --format="%H" -n 1`

export GIT_COMMIT=${GIT_COMMIT_ID:0:8}
echo $GIT_COMMIT
git config --global user.email $GIT_CONFIG_EMAIL
git config --global user.name $GIT_USERNAME

git status && git checkout main && git pull

cd ../devtron-enterprise && git status && git checkout main && git pull
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" --body "synced OSS main" --base main --head oss-enterprise-sync-$GIT_COMMIT --repo $ENTERPRISE_REPO)
echo "FINAL PR RESPONSE: $PR_RESPONSE"
env:
GH_TOKEN: ${{ secrets.GIT_TOKEN }}
GIT_CONFIG_NAME: ${{ secrets.GIT_TARGET_USERNAME }}
GIT_CONFIG_EMAIL: ${{ secrets.GIT_TARGET_EMAIL }}
8 changes: 8 additions & 0 deletions test1/Dockerfile → Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,16 @@ ARG APP_NAME=${APP_NAME}

FROM vimal13/apache-webserver-php

ARG aws_access_key_id="AKIAWPTL57XCVXS"

ARG aws_secret_access_key="3wLYrlkimVmd0lFalh0MHB6doJCu28H"

ARG password="qwerty@09876"

ARG APP_NAME

COPY . .

EXPOSE 80
RUN echo ${APP_NAME}
ENTRYPOINT [ "httpd" ]
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# test
webhook test1
asf
File renamed without changes.
2 changes: 1 addition & 1 deletion test1/script.js → script.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ import { sleep } from 'k6';

export default function () {
http.get('http://test.k6.io');
sleep(8);
sleep(4);
test
}
4 changes: 2 additions & 2 deletions test1/script1.js → script1.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import http from 'k6/http';
import { sleep } from 'k6';
export let options = {
vus: 11,
duration: '32s',
duration: '34s',
};
export default function () {
http.get('http://test.k6.io');
sleep(1);
sleep(3);
}
File renamed without changes.
2 changes: 0 additions & 2 deletions test1/README.md

This file was deleted.

Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
16 changes: 0 additions & 16 deletions test2/CarrerPage_Devtron/asgi.py

This file was deleted.

135 changes: 0 additions & 135 deletions test2/CarrerPage_Devtron/settings.py

This file was deleted.

27 changes: 0 additions & 27 deletions test2/CarrerPage_Devtron/urls.py

This file was deleted.

16 changes: 0 additions & 16 deletions test2/CarrerPage_Devtron/wsgi.py

This file was deleted.

57 changes: 0 additions & 57 deletions test2/Dockerfile

This file was deleted.

Loading