Fixed conflict with newer files

Author: awwal-badru

.circleci/circle_urls.sh

@@ -0,0 +1,12 @@
+REPO_ID=$(curl https://api.github.com/repos/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME} | jq --raw-output '.id')
+echo "Repo ID is ${REPO_ID}"
+
+URL=https://output.circle-artifacts.com/output/job/${CIRCLE_WORKFLOW_JOB_ID}/artifacts/${CIRCLE_NODE_INDEX}
+BASEURL=/intersect-training.github.io
+IMGURL=${URL}${BASEURL}/images/
+
+echo "URL is ${URL}"
+
+sed -i "35 s,.*,baseurl: $BASEURL,g" "_config.yml"
+sed -i "48 s,.*,urlimg: $IMGURL,g" "_config.yml"
+sed -i "34 s,.*,url: $URL,g" "_config.yml"

.circleci/config.yml

@@ -0,0 +1,79 @@
+version: 2.1
+
+workflows:
+  version: 2
+
+  # The build workflow will build a preview for the site, intended for PRs
+  # don't need to build gh-pages only other branches
+  build:
+    jobs:
+      - build-site:
+          filters:
+            branches:
+              ignore: gh-pages
+
+install: &install
+  name: install dependencies for build
+  command: |
+     $HOME/conda/bin/pip install -r ~/repo/.circleci/requirements.txt
+install_python_3: &install_python_3
+  name: install Python 3.5 dependencies
+  command: |
+      ls $HOME
+      if [ ! -d "/home/circleci/conda" ]; then
+          wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
+          /bin/bash Miniconda3-latest-Linux-x86_64.sh -b -p $HOME/conda
+          export PATH=$HOME/conda/bin:$PATH
+       else
+           echo "Miniconda 3 is already installed, continuing to build."
+       fi
+build_jekyll: &build_jekyll
+    name: Jekyll Build
+    command: |
+        if [ -z "$CIRCLECI_TRIGGER" ]; then
+            echo "Building EASI Site for Preview"
+            cp ~/repo/.circleci/circle_urls.sh ~/repo/circle_urls.sh
+            cd ~/repo
+            chmod u+x circle_urls.sh
+            bash circle_urls.sh
+            cat _config.yml
+            bundle install
+            bundle exec jekyll build
+        else
+            echo "Triggered by something else."
+        fi
+jobs:
+  build-site:
+    docker:
+      - image: cimg/ruby:3.1
+    working_directory: ~/repo
+    environment:
+      - JEKYLL_ENV: production
+      - NOKOGIRI_USE_SYSTEM_LIBRARIES: true
+      - BUNDLE_PATH: ~/repo/vendor/bundle
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+          - v1-dependencies
+          - rubygems-v1
+      - run: *install_python_3
+      - run: *install
+      - save_cache:
+          paths:
+            - /home/circleci/conda
+          key: v1-dependencies
+      - run:
+          name: Bundle Install
+          command: |
+              cd ~/repo
+              bundle install
+              bundle check || bundle install
+      - save_cache:
+          key: rubygems-v1
+          paths:
+            - vendor/bundle
+      - run: *build_jekyll
+      - store_artifacts:
+          path: ~/repo/_site
+          destination: EASI.github.io

.circleci/requirements.txt

@@ -0,0 +1 @@
+pyaml>=17.12.1

.gitignore

@@ -0,0 +1,5 @@
+.bundle
+.DS_Store
+.jekyll-metadata
+.sass-cache
+Gemfile.lock

CNAME

@@ -0,0 +1 @@
+intersect-training.org

Gemfile

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+#gem 'jekyll'
+
+group :jekyll_plugins do
+  gem 'jekyll-gist'
+  gem 'jekyll-paginate'
+  gem "jekyll-asciidoc"
+end
+
+gem 'asciidoctor', '~> 1.5.4'
+gem 'coderay', '1.1.1'
+
+
+gem "webrick", "~> 1.7"

LICENSE

@@ -1,6 +1,6 @@
-MIT License
+The MIT License (MIT)
 
-Copyright (c) 2023 AdaptiveExperiments
+Copyright (c) 2014 Moritz »mo.« Sauer // Phlow.de
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -68,7 +68,7 @@ This project is supported by National Science Foundation awards [2209821](https:
 ![](https://i.imgur.com/9qujX6H.png)
 
 
-### Contacts
+### Contact
 Jeffrey Carver, University of Alabama