Skip to content

awguild/WebGuild

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

18 Commits
 
 
 
 

Repository files navigation

Welcome to the Augustana Web Guild

Developer information

Install software

  1. Download and install xampp
  2. Download and install git
  3. Configure git by running these commands from the git bash (without the <>)
```
git config --global user.name "<Name>"
git config --global user.email <email address>
```

Create an account on Github

  1. Go to github.com and sign up
  2. Click account settings > SSH Keys (Click the "need help" link and follow the instructions to create an ssh key. You will probably need to run mkdir ./ssh before running cd ./ssh)
  3. Email guild@augustana.edu with your github username and request to be added to the developers team

Create an account on pivotal tracker

  1. Sign up on the pivotal tracker website
  2. Email guild@augustana.edu and request to be added to Development Projects

Checking out code

  1. Clone this project to your desktop (run comands in git bash)
```
git clone git@github.com:awguild/WebGuild.git ~/desktop/WebGuild
sh ~/desktop/WebGuild/scripts/Windowscheckout.sh //type yes if prompted for rsa fingerprint
```

Doing an update

  1. Make sure Apache is running in XAMPP
  2. Open the project's folder in a text editor (like Sublime)
  3. Open the git bash
```
cd /c/xampp/htdocs/<projectName>
```
  1. Pull newest changes
```
git pull origin
```
  1. Create a new branch (without the <>)
```
git checkout -b <name>
```
  1. Edits files to satisfy user story
  2. Stage changes and commit (without the <>)
```
git add .
git commit -m "<description of what you did in this commit>"
```
  1. Push your feature branch to github (without the <>)
```
git push -u origin <name>
```
  1. Create a pull request. Use [fixes #storyID] in the commit message (WITH the brackets)
  2. Merge pull request (if applicable wait for someone to review your work)
  3. Delete your feature branch from github (click the delete branch button)
  4. Clean up your local repo (without the <>)
```
git checkout master
git pull origin master
git branch -d <feature branch name>
```
  1. Copy files from htdocs to folder on freya (until we have post commit hooks set up)

Administrative Tasks

###Creating new repo

  1. Sign in to github and change your context to awguild
  2. Click the New repository button (Set the repo name to match the folder name in freya; set to public; ignore README;)
  3. Click Create Repository
  4. Copy code from freya to the desktop
  5. In GitBash, do
```
cd ~/Desktop/<NameOfProject> //changes directory to project directory
git init //initializes a new git repo
git add . //stages all the files for the next commit
git commit -m "Initial commit" //creates a commit with the message "Initial commit"
git remote add origin <SSH URL> //creates a new remote called origin that points to this project's Github SSH URL
git push -u origin master //pushes the master branch to your origin remote (GitHub)
```
  1. Check repo on GitHub to make sure you have all the files
  2. Add repo to checkout script(s), should look like
git clone git@github.com:awguild/<projectName>.git /C/xampp/htdocs/<projectName>
  1. Log into pivotal tracker as guild@augustana.edu
  2. Grab the api token from AugustanaWebGuild > Profile
  3. Click the Settings > Service Hooks on the github repo (not account settings, the repo settings)
  4. Paste the api token, check the active box, and hit update
  5. Add the repo to the developers team on github so that members of that team can push changes to the code

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Contributors 3

  •  
  •  
  •  

Languages