From 3bc45e12a9700622f2fe1fcc7a73b5e5269c3bc0 Mon Sep 17 00:00:00 2001 From: Zaquariah Holland Date: Mon, 12 Jul 2021 10:49:58 -0500 Subject: [PATCH 1/5] new deployment strat --- .github/workflows/build_and_deploy.yml | 34 ++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 .github/workflows/build_and_deploy.yml diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml new file mode 100755 index 0000000..15dc220 --- /dev/null +++ b/.github/workflows/build_and_deploy.yml @@ -0,0 +1,34 @@ +name: CI / CD + +# Controls when the action will run. +on: + # Triggers the workflow on push for the develop branch + push: + branches: [ develop ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_DEFAULT_REGION: 'us-west-2' + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + bundler-cache: true + - name: "Build Site" + run: bundle exec jekyll build + env: + JEKYLL_ENV: production + - name: "Deploy to AWS S3" + run: aws s3 sync ./_site/ s3://${{ secrets.AWS_S3_BUCKET_NAME }} --acl public-read --delete --cache-control max-age=604800 + - name: "Create AWS Cloudfront Invalidation" + run: aws cloudfront create-invalidation --distribution-id ${{ secrets.AWS_CLOUDFRONT_DISTRIBUTION_ID }} --paths "/*" \ No newline at end of file From a38322383ad6d9e22b1d7e3927adcbf37b12492a Mon Sep 17 00:00:00 2001 From: Zaquariah Holland Date: Mon, 12 Jul 2021 11:15:05 -0500 Subject: [PATCH 2/5] removed old workflow --- .github/workflows/build_and_deploy.yml | 34 -------------------------- 1 file changed, 34 deletions(-) delete mode 100755 .github/workflows/build_and_deploy.yml diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml deleted file mode 100755 index 15dc220..0000000 --- a/.github/workflows/build_and_deploy.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: CI / CD - -# Controls when the action will run. -on: - # Triggers the workflow on push for the develop branch - push: - branches: [ develop ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_DEFAULT_REGION: 'us-west-2' - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - bundler-cache: true - - name: "Build Site" - run: bundle exec jekyll build - env: - JEKYLL_ENV: production - - name: "Deploy to AWS S3" - run: aws s3 sync ./_site/ s3://${{ secrets.AWS_S3_BUCKET_NAME }} --acl public-read --delete --cache-control max-age=604800 - - name: "Create AWS Cloudfront Invalidation" - run: aws cloudfront create-invalidation --distribution-id ${{ secrets.AWS_CLOUDFRONT_DISTRIBUTION_ID }} --paths "/*" \ No newline at end of file From 9db972ef3bf5b9159f88d81e284f321bf00ff9ce Mon Sep 17 00:00:00 2001 From: Zaquariah Holland Date: Mon, 12 Jul 2021 12:00:11 -0500 Subject: [PATCH 3/5] new README format --- README.md | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/README.md b/README.md index e69de29..106987c 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,43 @@ +# Welcome to Code Quantums Repository! + +We are dedicated to being an open source organization and our website is no exception! +We look forward to our first Hackathon with everyone!! ✨ + +# Managing our repository + +It is every contributors' responsibility to ensure that a clean working environment is maintained. This allows others to work and utilize to space to better perform and develop on our growing code bases! + +## Current Workflows + +- `main` deploys to [codequantumutsa.com](http://codequantumutsa.com) +- `develop` deploys to [dev.codequantumutsa.com](http://dev.codequantumutsa.com) + +## Submitting a Change + +- pushing to `main` is restricted +- make sure you have any recent changes to `develop` +- create a new branch from `develop` and push that new branch +- create a pull request for the new branch into `develop` +- if all approved we will be doing weekly merges into `main` + +## Branch Naming + +Adding something new: +``` +feature/SHORT_DESCRIPTION_OF_FEATURE_HERE +``` + +Submitting a bug/error change: +``` +bug/SHORT_DESCRIPTION_OF_BUG_HERE +``` +- please note that once your branch is merged it *should* be deleted! +- restrictions have hopefully been placed on the `develop` and `main` branches so that they cannot be deleted! + +# Contact Us! + +Have a question that cannot be answered here? + +- [team@codequantumutsa.org](mailto:team@codequantumutsa.org) + +- [team@acmutsa.org](mailto:team@acmutsa.org) From 8b24a14fa388f04ad935bd4fa120785708f779ae Mon Sep 17 00:00:00 2001 From: LIsais Date: Tue, 13 Jul 2021 23:58:36 -0500 Subject: [PATCH 4/5] verbiage --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index f02f6bc..1acc7ed 100755 --- a/index.html +++ b/index.html @@ -218,7 +218,8 @@

The F.A.Q.

Who can attend?
-

CodeQuantum is targeting feminine identifying techies but is open to those who are 0s, 1s or anything in between. You must fall into the category of a college student, above 18+, or a recent graduate! If you don't identify as feminine then you can show your support by being a mentor! ✨

+

You may register as a hacker if you identify as a marginalized gender including, but not limited to, cisgender women, transgender women, transgender men, non-binary individuals, gender neutral individuals, genderqueer individuals, agender individuals, pangender individuals, or a gender who is otherwise underrepresented in tech. You must be a college student/recent graduate that is above 18+! + ✨

From 54741c91fd89e4da781f666b94323f3ba87908ce Mon Sep 17 00:00:00 2001 From: LIsais <62686877+LIsais@users.noreply.github.com> Date: Wed, 14 Jul 2021 07:54:16 -0500 Subject: [PATCH 5/5] Update index.html --- index.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 1acc7ed..6e8740b 100755 --- a/index.html +++ b/index.html @@ -218,8 +218,7 @@

The F.A.Q.

Who can attend?
-

You may register as a hacker if you identify as a marginalized gender including, but not limited to, cisgender women, transgender women, transgender men, non-binary individuals, gender neutral individuals, genderqueer individuals, agender individuals, pangender individuals, or a gender who is otherwise underrepresented in tech. You must be a college student/recent graduate that is above 18+! - ✨

+

You may register as a hacker if you identify as a marginalized gender including, but not limited to, cisgender women, transgender women, transgender men, non-binary individuals, gender neutral individuals, genderqueer individuals, agender individuals, pangender individuals, or a gender who is otherwise underrepresented in tech. You must be a college student/recent graduate that is above 18+!✨

@@ -378,4 +377,4 @@

Looking to Sponsor?

- \ No newline at end of file +