Merge pull request #2 from UCSD-E4E/redirects

feat: Allows redirects

.github/workflows/jekyll.yml

@@ -9,7 +9,6 @@ name: Deploy Jekyll site to Pages
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: ["main"]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -38,13 +37,15 @@ jobs:
         with:
           ruby-version: '3.2' # Not needed with a .ruby-version file
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-          cache-version: 0 # Increment this number if you need to re-download cached gems
+          cache-version: 1 # Increment this number if you need to re-download cached gems
+      - name: Checks Ruby Gems
+        run: bundle list
       - name: Setup Pages
         id: pages
         uses: actions/configure-pages@v4
       - name: Build with Jekyll
         # Outputs to the './_site' directory by default
-        run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}" --config _config.yml,_dev_config.yml
+        run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}" --config _config.yml,_dev_config.yml --safe
         env:
           JEKYLL_ENV: production
       - name: Upload artifact
@@ -58,6 +59,7 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
     needs: build
+    if: ${{ github.ref == 'refs/heads/main' }}
     steps:
       - name: Deploy to GitHub Pages
         id: deployment

Gemfile

@@ -15,6 +15,7 @@ gem "jekyll", "~> 4.3.3"
 group :jekyll_plugins do
   gem "jekyll-feed", "~> 0.12"
   gem "jekyll-seo-tag", "~> 2.6"
+  gem 'jekyll-redirect-from'
 end
 
 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

@@ -37,6 +37,8 @@ GEM
       webrick (~> 1.7)
     jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
+    jekyll-redirect-from (0.16.0)
+      jekyll (>= 3.3, < 5.0)
     jekyll-sass-converter (3.0.0)
       sass-embedded (~> 1.54)
     jekyll-seo-tag (2.8.0)
@@ -91,6 +93,7 @@ DEPENDENCIES
   http_parser.rb (~> 0.6.0)
   jekyll (~> 4.3.3)
   jekyll-feed (~> 0.12)
+  jekyll-redirect-from
   jekyll-seo-tag (~> 2.6)
   tzinfo (>= 1, < 3)
   tzinfo-data

README.md

@@ -24,4 +24,6 @@ The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "S
 
 ## Developer Get Started
 1. Follow the instructions at https://jekyllrb.com/docs/installation/ to install the Jekyll generator on your machine.
-2. Run `jekyll serve --livereload` in this repository root to deploy a live server to http://localhost:4000 or http://localhost:35729
+2. Run `jekyll serve --livereload --safe` in this repository root to deploy a live server to http://localhost:4000 or http://localhost:35729
+
+Dev deployment target: https://ucsd-e4e.github.io/website2.0/

_config.yml

@@ -37,6 +37,10 @@ permalink: /:categories/:title
 plugins:
   - jekyll-feed
   - jekyll-seo-tag
+  - jekyl-redirect-from
+
+whitelist:
+  - jekyll-redirect-from
 
 # Exclude from processing.
 # The following items will not be processed, by default.

join

@@ -0,0 +1,5 @@
+---
+permalink: /join
+redirect_to:
+  - https://docs.google.com/forms/d/e/1FAIpQLSdOa1xcK2mxjnEoOLQB_A0a0ERnyT_AGwdaxqG06R9meXnT5g/viewform
+---