Skip to content

Latest commit

 

History

History
121 lines (99 loc) · 6.15 KB

temporary_notes.md

File metadata and controls

121 lines (99 loc) · 6.15 KB
git clone [email protected]:metasfresh/metasfresh.git

cd metasfresh

git checkout -b gh6205_2nd

# move (almost) everything into a new "backend" folder
mkdir backend
git mv -k * backend
git mv .codacy.yaml .codebeatignore .gitignore .mvn backend # also move most hidden files
git commit -m "gh6205-app - move files to new backend folder" -m "metasfresh/metasfresh#6205"

# add metasfresh-webui-api to backend
git remote add -f webui-api [email protected]:metasfresh/metasfresh-webui-api.git
git fetch webui-api master
git merge webui-api/master --allow-unrelated-histories
mkdir backend/metasfresh-webui-api
git mv ISSUE_TEMPLATE.md  Jenkinsfile*  LICENSE.txt  metasfresh-webui-api.launch  metasfresh-webui-api_jrebel.launch  metasfresh-webui-api_logstash.launch  pom.xml  README.md src backend/metasfresh-webui-api
git mv .gitattributes .gitignore  .skip-archive-generated-artifacts  .workspace-sql-scripts.properties backend/metasfresh-webui-api
git commit -m "gh6205-app - move metasfresh-webui-api files to new backend folder" -m "metasfresh/metasfresh#6205"

# add metas-fresh-dist as a sibling to backend
git remote add -f dist [email protected]:metasfresh/metasfresh-dist.git
git fetch dist master
git merge dist/master --allow-unrelated-histories
mkdir distribution
git mv *.launch distribution
git mv .gitignore .workspace-sql-scripts.properties ait base dist Jenkinsfile LICENSE.txt pom.xml README.md serverRoot swingui distribution
git commit -m "gh6205-app - move metasfresh-dist files to new distribution folder" -m "metasfresh/metasfresh#6205"

# add metasfresh-webui-frontend as another sibling to backend
git remote add -f webui-frontend [email protected]:metasfresh/metasfresh-webui-frontend.git
git fetch webui-frontend master

mkdir temp # make space
git mv CODE_OF_CONDUCT.md  README.md Jenkinsfile CONTRIBUTING.md ReleaseNotes.md temp/
git commit -m "gh6205-app - temporarily make space for frontend files" -m "metasfresh/metasfresh#6205"

git merge webui-frontend/master --allow-unrelated-histories
mkdir frontend
git mv CONTRIBUTING.md docker index.html Jenkinsfile LICENSE.md package.json plugins.js.dist server.js src test_setup webpack.config.js config.js.dist favicon.png images ISSUE_TEMPLATE.md jsdoc.json licenses.json  plugins README.md snapshots.js tutorials webpack.prod.js frontend
git mv .babelrc .editorconfig .eslintrc .gitignore .storybook .dockerignore .eslintignore .htaccess .stylelintrc frontend
git commit -m "gh6205-app - move frontend files to new frontend folder" -m "metasfresh/metasfresh#6205"
git mv temp/* .
git commit -m "gh6205-app - move temporarily moved files back from temp folder" -m "metasfresh/metasfresh#6205"

# add metasfresh-e2e as another sibling to backend
git remote add -f e2e [email protected]:metasfresh/metasfresh-e2e.git
git fetch e2e master
mkdir temp # make space
git mv CODE_OF_CONDUCT.md  README.md Jenkinsfile CONTRIBUTING.md ReleaseNotes.md temp/
git commit -m "gh6205-app - temporarily make space for frontend files" -m "metasfresh/metasfresh#6205"
git merge e2e/master --allow-unrelated-histories
mkdir e2e
git mv .babelrc .eslintrc .github cypress.json Dockerfile Jenkinsfile package.json reporter-config.json run_docker_via_jenkins .editorconfig .gitignore cypress metasfresh-e2e.code-workspace README.md run_cypress.sh  src webpack.config.js e2e
git commit -m "gh6205-app - move e2e files to new e2e folder" -m "metasfresh/metasfresh#6205"

mkdir -p misc/services
mkdir temp # make space
git mv CODE_OF_CONDUCT.md  README.md Jenkinsfile CONTRIBUTING.md ReleaseNotes.md temp/
git commit -m "gh6205-app - temporarily make space for frontend files" -m "metasfresh/metasfresh#6205"

# procurement-webui
mkdir -p misc/services/procurement-webui
git remote add -f procurement-webui [email protected]:metasfresh/metasfresh-procurement-webui.git
git merge procurement-webui/master --allow-unrelated-histories
git mv .gitignore LICENSE.md  metasfresh-procurement-webui_localhost.launch README.md  metasfresh-procurement-webui.launch readme-launch-configs.md Jenkinsfile metasfresh-procurement-webui_jrebel.launch pom.xml src misc/services/procurement-webu
git commit -m "gh6205-app - move procurement-webui files to new misc/services folder" -m "metasfresh/metasfresh#6205"

# edi
mkdir -p misc/services/edi
git remote add -f edi [email protected]:metasfresh/metasfresh-edi.git
git merge edi/master --allow-unrelated-historiesgit merge edi/master --allow-unrelated-histories
git mv .pmd kubernetes README.md start_esb-camel_docker.sh .gitignore Dockerfile edi-remote-via-ssh-tunnel.launch Jenkinsfile LICENSE.txt pom.xml src misc/services/edi
git commit -m "gh6205-app - move edi files to new misc/services folder" -m "metasfresh/metasfresh#6205"
 
# admin
mkdir -p misc/services/admin
git remote add -f admin [email protected]:metasfresh/metasfresh-admin.git
git merge admin/master --allow-unrelated-histories
git mv .gitignore Jenkinsfile LICENSE metasfresh-admin.launch pom.xml README.md src misc/services/admin
git commit -m "gh6205-app - move admin files to new misc/services folder" -m "metasfresh/metasfresh#6205"

# parent
mkdir -p misc/parent-pom
git remote add -f parent [email protected]:metasfresh/metasfresh-parent.git
git merge parent/master --allow-unrelated-histories
git mv .gitignore assemblies Jenkinsfile LICENSE.md pom.xml misc/parent-pom
git commit -m "gh6205-app - move parent-pom files to new misc folder" -m "metasfresh/metasfresh#6205"

git mv temp/* .
git commit -m "gh6205-app - move temporarily moved files back from temp folder" -m "metasfresh/metasfresh#6205"

add and commit that root Jenkinsfile

keep up to date

git pull && \
git merge origin/master && \
git fetch webui-api master && \
git merge webui-api/master --allow-unrelated-histories && \
git fetch dist master && \
git merge dist/master --allow-unrelated-histories && \
git fetch webui-frontend master && \
git merge webui-frontend/master --allow-unrelated-histories && \
git fetch edi master && \
git merge edi/master --allow-unrelated-histories && \
git fetch procurement-webui master && \
git merge procurement-webui/master --allow-unrelated-histories && \
git fetch admin master && \
git merge admin/master --allow-unrelated-histories && \
git fetch e2e master && \
git merge e2e/master --allow-unrelated-histories