Add ci #49
Add ci #49
Conversation
|
@jhoover4 - the files have been moved as of #53. With public folder being removed from It looks like this change introduced some conflicts to this PR - likely because in this PR the files appear to have been cut and pasted instead of moved. (See files changed.) If it is easier, feel free to close this PR and create 2 new ones for:
Otherwise, you can keep this one open for CI but please pull from Thank you! |
ProsperousHeart
added
enhancement
There was a problem hiding this comment.
updated for linting - approved
There was a problem hiding this comment.
updated for linting - approved
There was a problem hiding this comment.
this was moved out oy my-app into the main app folder as per here
There was a problem hiding this comment.
moved to from my-app to main app folder (parent) for #50 - approved
There was a problem hiding this comment.
moved to from my-app to main app folder (parent) for #50 - approved
|
@ProsperousHeart I did let you know ASAP, I'm the one who found it and fixed it. I'm confused why PRs aren't sufficient for communication here. The merge conflict is just there because we pulled in the other PR. All you need to do is merge locally and push up, which I did. I'm not going to make a whole other PR for linting/CI. This is an operation that is being done through the CI and makes sense as one PR. Why are we introducing more work and overhead here when the work is already done? This is already a very small PR. |
|
with #57 now complete, this one should be good to go for reintegration and final check before merging thank you again for working with us through this |
# Conflicts: # .eslintrc.js # .gitignore # docs/react-README.md # package-lock.json # package.json # src/App.test.js # src/components/About/About.js # src/components/Header/header.html # src/components/Logo/Logo-ORIGINAL.jsx # src/components/Mission/index.jsx # src/components/Nav/nav-BASE.js # src/components/Nav/nav.js # src/components/Projects/chatGPT-Projects.html
jhoover4
force-pushed
the
add_ci
branch
2 times, most recently
from
5e235e6 to
88c7cc8
Compare
There was a problem hiding this comment.
For the most part the updates were ok (though one of the packages was updated oddly) ... And while I'm weary about the package file update, I have no knowledge to voice any changes. So I would have approved, but then the changes in other files are forcing a halt.
The files that appear to have been changed from linting? This is putting the file back tot he way it was before your last linting update and merge. Your new update is trying to undo that and introduce things like a spelling error that was already rectified.
So cannot approve yet. 😞
|
I also saw the package-lock file being the only package file updated. Any idea to that @jhoover4 ? |
Probably because I didnt commit it before and things have updated 🤷. It should be fine after this |
Adding CI functionality, prettier, and eslint. For this to work we have to move everything to root so the project is not
/src.Prettier
Prettier is a code formatter used by the javascript community to automatically enforce one code style so there is no arguing about "spaces/tabs" or single quotes or double quotes, etc. It leaves what we call "bike shedding" (arguing about dumb pointless things) at the door. See https://prettier.io/ for more details.
Eslint
Eslint is used to check code for common errors and automatically correct them. This keeps it easy for reviewers to focus on more complex issues and helps you quickly fix issues. See https://eslint.org/ for more details. We're using the React extension here, which is a common extension for react apps.
Continuous Integration
Continous Integration is what developers call the automatic process of linting (checking code for style errors or erros in general), testing, and other checks BEFORE your branch is merged into master (integrated). This is done usually through platforms that are running "jobs" for these various tasks. See https://docs.gitlab.com/ee/ci/introduction/ for a good overview. Here we're using https://docs.github.com/en/actions/using-workflows as our CI runner to execute these tasks for us.